1597 Commits

Author	SHA1	Message	Date
Chi Kei Chan	83cda2b82e	Refactor Confirmation Tx to render different screen	2017-09-21 22:25:16 -07:00
Chi Kei Chan	3ec2f53463	Integrate Add Token	2017-09-21 18:44:52 -07:00
Dan	24fd16b1be	Abstract account modal.	2017-09-21 16:45:18 -07:00
Dan	39afbea7aa	Confirm screen shows amount plus gas in total field	2017-09-21 16:43:29 -07:00
Dan	4fa79ffc6e	Clean up code in send.js	2017-09-21 16:42:55 -07:00
Dan	97810acb53	Handles errors with to field and renders warnings from backend in send token.	2017-09-21 16:41:52 -07:00
Chi Kei Chan	04da22db08	Add Token UI - hover/select state; fetch token address	2017-09-20 22:57:36 -07:00
Kevin Serrano	b22783a223	Merge branch 'master' into new-currency-test	2017-09-20 09:40:33 -07:00
Chi Kei Chan	0204aa2001	Add Add Token UI; Add Fuzzy search for tokens	2017-09-19 21:18:36 -07:00
Chi Kei Chan	e7f1fc4436	Buy Modal Styling	2017-09-19 18:49:35 -07:00
Dan	566ffee8cd	Ensure conversion util does not return insignificant trailing zeroes.	2017-09-19 12:56:51 -07:00
Chi Kei Chan	a67d3ecd46	Merge branch 'master' into NewUI-flat	2017-09-18 18:13:15 -07:00
Kevin Serrano	bd8428e9ed	Comply with current currency API and add additional styling.	2017-09-18 16:09:01 -07:00
Kevin Serrano	51cebcc173	Fix the property query for new currencies.	2017-09-18 12:20:41 -07:00
Roman Rodov	9af52ee1c5	Another merge conflict resolved.	2017-09-18 12:00:12 -07:00
Roman Rodov	f6f7798828	Resolve merge conflicts for currency sort merge.	2017-09-18 11:51:17 -07:00
Dan Finlay	fa50bf9587	Merge pull request #2075 from MetaMask/mixed-case ... Specific error for send screen: address checksum fails	2017-09-18 11:46:50 -07:00
Kevin Serrano	51f0911f87	Merge branch 'master' into new-currency-test	2017-09-18 11:46:10 -07:00
Chi Kei Chan	190330db92	Merge branch 'master' into NewUI-flat	2017-09-18 11:41:46 -07:00
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 Finlay	545cbbebb9	Merge branch 'master' into fix-tooltip	2017-09-18 11:20:00 -07:00
Dan Finlay	67accea693	Merge branch 'master' into mixed-case	2017-09-18 11:17:00 -07:00
Dan	54bbf8d859	Handle transaction totals in WEI in tx-list, send and pending.	2017-09-15 16:23:23 -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	feb90f2fc4	Clear token selection when changing account.	2017-09-15 16:18:48 -07:00
Dan	095d327140	Adds USD to token list.	2017-09-15 16:16:41 -07:00
Dan	ab77142c90	Show dollar sign before USD on account details page.	2017-09-15 16:10:34 -07:00
Dan	5c86194c0a	Show loading on conf-tx until the pending tx is available.	2017-09-14 15:45:18 -07:00
Chi Kei Chan	7d76e404f2	Make send token responsive; fix desktop send modal height	2017-09-14 11:45:59 -07:00
Chi Kei Chan	35d8671843	Add responsive UI to send ether modal	2017-09-14 09:56:40 -07:00
Kevin Serrano	456ceefcf7	Modify conversion to new api.	2017-09-14 09:14:57 -07:00
Kevin Serrano	cb8856597c	Merge branch 'master' into new-currency-test	2017-09-14 08:35:48 -07:00
Chi Kei Chan	4bcc62500f	Style send ether screen	2017-09-14 01:32:24 -07:00
Chi Kei Chan	93a1089e08	Show token tx properly	2017-09-14 01:09:57 -07:00
Chi Kei Chan	d722c1045f	Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rate	2017-09-13 19:57:33 -07:00
Dan	6bd71d6937	Fix send and pending.	2017-09-13 16:30:39 -07:00
Dan Finlay	c17c657693	Merge branch 'master' into AddBalanceController	2017-09-13 15:11:03 -07:00
Dan Finlay	a01921758b	Add computed balance to account detail view	2017-09-13 15:06:04 -07:00
Dan Finlay	0ba6493175	Use computed balance for tx confirmation	2017-09-13 14:31:48 -07:00
Dan	ca46bd200b	Stop setting 'currentCurrency' and use local state for active currency in send.js	2017-09-13 14:25:20 -07:00
Dan	a5ab91e572	Enables Cancel button in confirmation screen.	2017-09-13 14:24:48 -07:00
Dan	e2dc9328fc	Send user to most recent pending transaction after sending a transaction.	2017-09-13 14:24:03 -07:00
Dan	09a4491bb1	Fix saving/sending of amounts in USD	2017-09-13 14:22:58 -07:00
Dan	55d62190e3	Fixes the saving of transactions in send and display in tx-list with conversion utility.	2017-09-13 14:22:58 -07:00
Dan	6fa1cd6225	Reapply conversion utility changes and fix calls to utility in pending-tx.	2017-09-13 14:22:30 -07:00
Kevin Serrano	a22a2586ab	Haha silly me, only when gas is estimated and not explicit.	2017-09-13 13:24:16 -07:00
Kevin Serrano	6e725b123b	Lower warning threshold for high tx fee to account for fluctuating blockGasLimits	2017-09-13 12:22:08 -07:00
Kevin Serrano	06153dd47d	Add warning of higher failure risk since app proposed gasLimit.	2017-09-13 12:17:42 -07:00
Chi Kei Chan	8f31b05ac5	Add token exchange rates	2017-09-13 01:25:39 -07:00
Chi Kei Chan	8b5f2a95df	Improve styling in Confirmation Screen; Show decoded send token data	2017-09-12 23:04:01 -07:00
Chi Kei Chan	b64471833f	Revert "Overhaul currency conversion utility and update calls to utility in pending-tx." ... This reverts commit 080890a46e.	2017-09-12 23:04:01 -07:00
Kevin Serrano	962794d025	fixed position of tooltips to avoid overflow.	2017-09-12 16:15:56 -07:00
Dan	080890a46e	Overhaul currency conversion utility and update calls to utility in pending-tx.	2017-09-12 16:05:59 -07:00
Dan Finlay	7ed1fe90f8	Fix support link	2017-09-12 15:07:08 -07:00
Dan J Miller	492507aa94	[NewUI] Color tx-list-item text depending on transaction status. (#2050) ... * Color tx-list-item text depending on transaction status. * Handle css change of text colour with scss instead on inline styles, add classnames package and helper function. * Refactored to use classnames with component property className.	2017-09-12 14:59:33 -07:00
Kevin Serrano	ef6967325e	Check if all lower or upper before doing checksum.	2017-09-12 12:52:13 -07:00
Kevin Serrano	7810880f0c	Add specific error message for failed address checksum.	2017-09-12 12:23:21 -07:00
Kevin Serrano	ad14e9338d	Convert state logs into a download.	2017-09-12 09:34:48 -07:00
Chi Kei Chan	7eb6dae418	Added signTokenTx; Adding token confirmation screen	2017-09-12 02:22:23 -07:00
Chi Kei Chan	836bf2e1a3	Add frontend validation to send-token	2017-09-11 23:18:54 -07:00
Dan J Miller	1e83835ba8	[New-UI] Confirm Screen restyle and connect to state (#2042) ... * Adds utility for converting currencies (WIP) * Implements confirm screen * Style tweaks. * Confirm screen total ammount now uses real data. * Confirm screen total ammount now uses real data. * Replace content divider with sibling css. * Replace section divider with scss.	2017-09-11 22:19:05 -07:00
Chi Kei Chan	062e67bff8	Add buttons; handle back; add yarn.lock	2017-09-11 22:14:09 -07:00
Dan	392d0d020c	Use transparent border for consistent size with and without border.	2017-09-11 19:16:43 -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
Kevin Serrano	213af0cd6c	Fix typo.	2017-09-11 16:52:35 -07:00
Kevin Serrano	e7c1a11b4d	Add ability to save seed words as file.	2017-09-11 16:48:02 -07:00
Kevin Serrano	aa021b9209	Add some styling.	2017-09-11 16:40:45 -07:00
Kevin Serrano	fa1ec5dcd1	Move function as util function.	2017-09-11 16:22:20 -07:00
Kevin Serrano	3a7d4a5d4e	Basic private key download file functionality.	2017-09-11 16:13:28 -07:00
Kevin Serrano	27ba7f6ed3	Show reject all only when tx count is > 1	2017-09-11 14:12:35 -07:00
Kevin Serrano	2e18dd27a4	Merge github.com:MetaMask/metamask-extension into rejectallunapproved	2017-09-11 13:58:46 -07:00
Chi Kei Chan	663cb758b3	Style send token screen	2017-09-11 00:45:06 -07:00
Thomas Huang	430d6d20f1	Merge pull request #2047 from MetaMask/i1997-networkindicate ... Add caret to dropdown network selector	2017-09-08 14:38:00 -07:00
Dan	395e8bfce0	Use width 100 and margin for the new modal input.	2017-09-08 10:56:56 -07:00
Dan	5a8433b6ce	New account modal top right close button working.	2017-09-08 10:56:56 -07:00
Dan	ab4005cab8	Tweak styles in new-account-modal.	2017-09-08 10:56:56 -07:00
Kevin Serrano	0e6c11a3b5	Fix typo.	2017-09-07 18:01:39 -07:00
Kevin Serrano	54a5a117d5	Fix link to open new tab.	2017-09-07 18:00:45 -07:00
Kevin Serrano	6560a2c3af	Add front-end validation for own adddresses as a token contract address. Add information on token contract addresses.	2017-09-07 17:55:34 -07:00
Kevin Serrano	54fb8e8cef	Add cursor on hover on loading. Change some wording.	2017-09-07 16:26:31 -07:00
Kevin Serrano	8d7f78c1a5	Add caret to indicate network is dropdown.	2017-09-07 16:18:32 -07:00
Dan Finlay	64717726c4	Reword forgot password to restore seed phrase ... This always confuses people, I just finally did it.	2017-09-07 15:27:40 -07:00
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
Kevin Serrano	69c7fe24b3	Place object property retrieval inside try-catch	2017-09-07 12:17:36 -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
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
Chi Kei Chan	14b2f3e391	Show token balance and identicon	2017-09-06 23:03:23 -07:00
Chi Kei Chan	f1fb9e10a0	Adding Token transaction detail screen	2017-09-06 03:17:49 -07:00
Chi Kei Chan	690ddf5ed7	Fix token list	2017-09-06 00:36:52 -07:00
Chi Kei Chan	06b2a04a42	Implement tokens list UI	2017-09-06 00:36:31 -07:00
Kevin Serrano	3e2bd19881	Merge branch 'master' into readd-loose	2017-09-05 15:48:15 -07:00
Dan	562d2fadae	Use .entries() instead of .keys(), and use more destructuring, for simpler code.	2017-09-05 13:00:50 -07:00
Dan	78f39bcce6	Send tx working; user is taken to confirm page with correct transaction information.	2017-09-05 13:00:50 -07:00
Dan Finlay	90272e252f	Make eth_sign deprecation warning more useful ... Link to descriptive article that demonstrates the new preferred method.	2017-09-05 11:44:26 -07:00
Kevin Serrano	e647337a8a	Resolve merge conflict from master	2017-09-05 09:03:44 -07:00
Kevin Serrano	162aedb30b	Merge branch 'master' into new-currency-test	2017-09-05 09:01:05 -07:00
Dan	6ef483be4a	Remove wallet-view scrollbars.	2017-09-04 18:46:14 -07:00
Dan	7d6ad48f15	Touch up transaction list item styles, remove main-content scroll bars, align buttons with main-content..	2017-09-04 18:46:14 -07:00
Dan	57b3cdf948	Fix styling of buy and send buttons on main screen.	2017-09-04 18:46:14 -07:00
Dan	3cb51e32c9	Capitalizations via text-transform for main screen transactions.	2017-09-04 18:46:14 -07:00
Dan	5d8bf6c86a	Adjust left margin in main container.	2017-09-04 18:46:14 -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 Finlay	ddd559718f	Update support link	2017-09-01 11:01:53 -07:00
Dan	0d6e64bfbe	Use flex to ensure network name does not wrap.	2017-09-01 00:12:58 -07:00
Dan	c436b6ffb3	Adjust z-index of header so that it stays in place when scrolling.	2017-09-01 00:12:58 -07:00
Dan	799627189d	Fix margin, padding, height for header.	2017-09-01 00:12:58 -07:00
Dan	d5998d3b07	Fixed network font	2017-09-01 00:12:58 -07:00
Dan	5452a26b36	Fixes lint errors and adds stylelint-config-standard to package.json	2017-08-31 04:16:07 -07:00
Dan	e7b3ef0708	Lint fixes	2017-08-31 04:16:07 -07:00
Dan	3ea841e276	Refactor gas-fee-display to include usd and eth fee displays as separate components.	2017-08-30 16:46:24 -07:00
Dan	5a7e4c4e76	Move gas fee to a separate component.	2017-08-30 16:46:24 -07:00
Dan	1485ec7392	Move currency toggle to its own component.	2017-08-30 16:46:24 -07:00
Dan	3ce69e1b65	Clean up send.js and eth-balance.js with es6.	2017-08-30 16:46:24 -07:00
Kevin Serrano	4b058bc7eb	Merge branch 'master' into i1986-AddVersionToStateLogs	2017-08-29 18:09:39 -07:00
Thomas Huang	04011f9ea7	Multiple tokens shows the amount when greater than 1	2017-08-29 17:54:01 -07:00
Kevin Serrano	056276af02	integrate infura currency	2017-08-29 16:36:05 -07:00
Dan Finlay	54ce267a9f	Add version to state logs ... Fixes #1986	2017-08-29 11:42:44 -07:00
Dan	c605c9897d	Minor clean up.	2017-08-29 16:09:56 -02:30
Dan	5facba89ca	Replace Avenir Next with alternative.	2017-08-29 14:16:32 -02:30
Dan	b251d0f675	Center tooltip on small screen size by using flexbox	2017-08-29 13:43:43 -02:30
Dan	cd5861541c	Use hex values only in send.js to handle limit and price; GasTooltip accepts and returns values as hex (allows user to enter floats)	2017-08-29 12:26:33 -02:30
Dan	cd351e8aef	Move getTaxBN and bnMultiplyByFraction to util.js	2017-08-29 12:26:32 -02:30
Dan	dc72c4cc91	Using eth balance component to ensure proper rounding.	2017-08-29 12:26:32 -02:30
Dan	af6e30b8ba	Bind SendTransactionScreen methods to this in constructor.	2017-08-29 12:26:32 -02:30
Dan	43ceeacf0f	Refactor for clean handling of tooltip close.	2017-08-29 12:26:31 -02:30
Dan	0a44c82458	Styles and behaviour correct	2017-08-29 12:26:20 -02:30
Dan	b785beb546	Final styling improvements for tooltip; plus a few for send form.	2017-08-25 20:55:03 -02:30
Dan	c9e134a996	Fully connect gas data in send form and tooltip to state; final styling improvements. ... Fully connect gas fields in send form and tooltip to state	2017-08-25 20:54:04 -02:30
Dan	05e6eaf171	Updating current currency from send form.	2017-08-25 17:31:56 -02:30
Dan	ff247289ae	Tooltip closing on click outside.	2017-08-25 17:04:23 -02:30
Dan	e56b8c5055	Refactor tooltip to remove external lib; tooltip now updating gas fee in parent.	2017-08-25 17:04:23 -02:30
Dan	5677fdaf68	Toggling tooltip.	2017-08-25 17:03:41 -02:30
Dan	d990a8eb86	Add 'customize' text to gas input.	2017-08-25 17:03:41 -02:30
Dan J Miller	4076496c8e	Patch 3 new account modal (#1962) ... * Account details modal styling changes. * Tweaking styles. * New account modal re-styling. * Tweaks to paddings, margins, font sizes, colors and modal dimensions. * Replace colour codes with variables.	2017-08-24 17:31:01 -07:00
Dan J Miller	744b78e9c8	Patch 2 account details modal (#1957) ... * Account details modal styling changes. * Tweaking styles.	2017-08-24 17:25:27 -07:00
Dan Finlay	e0ccdcd6fd	Remove eth-tx-viz link from tx history icons	2017-08-23 09:40:24 -07:00
Dan J Miller	5b62f10a5f	Modify buy and send buttons color, border-radius and various size properties. (#1956)	2017-08-22 16:42:17 -07:00
sdtsui	9d69401041	Hook up showAddToken to dropdown menu item in account options dropdown	2017-08-22 16:25:23 -07:00
sdtsui	18496ad859	Render TxListItem component from real data: address, identicon, status, ETH value	2017-08-22 16:16:56 -07:00
sdtsui	9dce1b6fd5	Remove fake transactions and balances from tx-list and wallet-view, respectively	2017-08-22 15:24:48 -07:00
sdtsui	5893f2fd19	Add data field to send token screen	2017-08-22 15:22:00 -07:00
sdtsui	1528fae9ea	[WIP] Successfully sign a hardcoded transaction, hook up remaining inputs and error validation later	2017-08-22 15:13:50 -07:00
sdtsui	3b5749c3bc	[WIP] Use hardcoded values for dispatching from signTx	2017-08-22 15:05:23 -07:00
sdtsui	c1fd19393f	Remove border and apply background color to gas input	2017-08-22 13:09:27 -07:00
sdtsui	97a6a8e4f6	Add layout and props for send screen inputs	2017-08-22 12:47:58 -07:00
sdtsui	d1bc7111b5	[WIP] - Styling Send Screen - Need to bring in data contract for signTx	2017-08-22 09:03:42 -07:00
sdtsui	5900cc8522	Tweak z-indicies	2017-08-22 08:37:15 -07:00
sdtsui	d193778958	Adjust zIndex and width for send screen	2017-08-21 17:59:08 -07:00
sdtsui	d6116aaf57	[WIP] Tweak Send Screen Styles	2017-08-21 16:59:00 -07:00
sdtsui	b0759ddc18	Hook up send screen action to Send Button in TxView	2017-08-21 12:53:15 -07:00
sdtsui	27b75b67b4	Hook up identicon and buttons to AccountDetailsModal, clean up colors	2017-08-21 12:26:36 -07:00
sdtsui	877faaf096	Integrate old QR component with new modal layout	2017-08-21 10:27:56 -07:00
sdtsui	b836d0483d	[WIP] Render a QR code in AccountDetailsModal	2017-08-21 10:06:29 -07:00
sdtsui	fe5817051b	[WIP] Aggregate data for QRView	2017-08-21 09:50:22 -07:00
sdtsui	86b71f014a	Add wrapper CSS for NewAccountModal	2017-08-21 06:14:28 -07:00
sdtsui	35508a2898	Add wrapper CSS for AccountDetailsModal	2017-08-21 05:58:30 -07:00
sdtsui	3fa7c5dc08	Hook up hideModal action to close icon in EditAccountNameModal	2017-08-21 04:53:39 -07:00
sdtsui	c2636143c3	Hook up selected account label display to main wallet view	2017-08-21 04:51:55 -07:00
sdtsui	d82233b95c	Hook up actions to EditAccountNameModal	2017-08-21 04:46:38 -07:00
sdtsui	80a2cba38e	Enhance global modal to accept styles from different components	2017-08-21 03:53:01 -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	4e9376ca71	Extend modal implementation and state management to accomodate multiple modal types	2017-08-20 18:32:58 -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
Dan Finlay	98bedfabf9	Fix eth sign formatting	2017-08-17 15:35:17 -07:00
Dan Finlay	343a7e9cce	Transition to home view after tx error	2017-08-16 17:06:21 -07:00
Dan Finlay	9fbdeab3de	Fallback to ethplorer link	2017-08-16 12:55:34 -07:00
Dan Finlay	3b6ee032f5	Remove dead code	2017-08-16 09:52:09 -07:00
Dan Finlay	722d91c866	Remove default tokens	2017-08-16 09:49:23 -07:00
Dan Finlay	b69f5533d9	ReEnable Token List	2017-08-16 09:49:18 -07:00
Kevin Serrano	923415213f	Merge pull request #1916 from MetaMask/fix/account-name-scroll ... Oneliner for account label overflow issue on QubesOS	2017-08-15 14:08:30 -07:00