2106 Commits

Author	SHA1	Message	Date
Alexander Tseung	7caa914223	Fix Import Account link not hiding sidebar	2017-10-16 01:43:27 -04:00
Dan	a9244f5e42	Customize Gas connected to state	2017-10-15 23:09:05 -04:00
Dan Finlay	06094c914b	Move etherscan link logic into module	2017-10-14 11:23:44 -04:00
Alexander Tseung	a59972dcab	Prevent adding already added tokens (#2362)	2017-10-13 14:14:48 -07:00
Alexander Tseung	3fd9c8b57f	Fix cursor on unclickable transactions (#2356)	2017-10-13 14:14:26 -07:00
Alexander Tseung	b149cceda0	Fix exception thrown when tokens is null (#2355)	2017-10-13 13:34:28 -07:00
Alexander Tseung	a84014eff8	Fix Localhost 8545 option in network dropdown (#2357)	2017-10-13 13:25:33 -07:00
Alexander Tseung	54a61a4021	Fix styling for Accept buttons in notices (#2358)	2017-10-13 13:24:17 -07:00
Alexander Tseung	6defb880fb	Fix SELECT TYPE dropdown changing sizes based on error message (#2359)	2017-10-13 13:23:50 -07:00
Alexander Tseung	222a203353	Fix click to copy for private key not working (#2360)	2017-10-13 13:23:10 -07:00
Dan J Miller	803eaaf968	[NewUI] SendV2-#8: Send container handles tokens; gas info dynamic from state (#2364) ... * Adds memo field to send-v2. * Vertical align transaction with flexbox. * Customize Gas UI * Remove internal state from InputNumber and fix use in gastooltip. * Move customize-gas-modal to its own folder and minor cleanup * Create send container, get account info from state, and make currency display more reusable * Adjusts send-v2 and container for send-token. Dynamically getting suggested gas prices.	2017-10-13 13:19:22 -07:00
Chi Kei Chan	81f62a7443	Adding Account Dropdown V2	2017-10-13 02:11:01 -04:00
Chi Kei Chan	57179d2b05	Various styling fixes	2017-10-12 18:46:18 -04:00
Dan	7ec77e0b45	Refactor amount input: dynamic input width with vanilla js.	2017-10-12 11:09:05 -07:00
Dan	2898914a54	Send v2 amount unit moves correctly.	2017-10-12 11:09:05 -07:00
Dan	ea7926c211	Adds amount and gas field to sendV2.	2017-10-12 11:09:05 -07:00
Frankie	c4adefcc53	Merge pull request #2318 from MetaMask/network-controller-client ... NetworkController refactor for new EthClient interface	2017-10-12 05:45:10 -07:00
Dan Finlay	9f063c320c	Fix link to token support page	2017-10-11 15:15:31 -04:00
kumavis	f0713d4b1a	ui - network - fix localhost active status	2017-10-11 01:01:29 -07:00
Dan	fbab0f3a1f	Send v2 to autocomplete.	2017-10-10 18:19:15 -07:00
Chi Kei Chan	e20ec3b389	Token menu ellipsis alignment	2017-10-10 14:43:06 -07:00
Chi Kei Chan	b7e2bcf806	Reduce header shadow on mobile	2017-10-10 14:40:00 -07:00
Chi Kei Chan	d4343fe7e5	Fix recipient on send token	2017-10-10 14:36:13 -07:00
Chi Kei Chan	c221f5ce79	Confirm Token and Confirm Contract v2	2017-10-10 14:30:20 -07:00
Chi Kei Chan	119c2b2423	Confirm eth v2	2017-10-10 14:16:57 -07:00
Kevin Serrano	1816eca914	Merge branch 'master' into version-debugging	2017-10-10 08:38:27 -07:00
Kevin Serrano	24a55cf777	Make the function callback friendly.	2017-10-10 08:36:15 -07:00
Dan	71d6463984	Refactor 'rendersingleidentity' to a stand alone account-list-item component.	2017-10-09 18:24:14 -07:00
Dan	80463072b5	UI for readonly from component. From dropdown opening and closing. Mockdata.	2017-10-09 18:24:14 -07:00
Dan Finlay	f18615a82a	Merge pull request #2296 from MetaMask/precision-fix ... Fix precision to account for small wei increase.	2017-10-09 14:15:09 -07:00
Dan	db1258f3de	Conversion util can invert conversion rate	2017-10-08 17:49:52 -07:00
Dan	49f76d27a9	Adds checkFeatureToggle util.	2017-10-08 17:48:09 -07:00
Dan	bbe893a0d8	UI for send screen container without form rows.	2017-10-08 17:48:09 -07:00
Dan	49aa6e73ea	Edit account modal shows and allows editing of name from props, not just placeholder.	2017-10-08 17:45:59 -07:00
Dan	c9c940bfc1	Clear selected token when changing network.	2017-10-08 17:45:34 -07:00
Sergey Ukustov	53bb4bebb1	More appropriate styling	2017-10-07 23:25:40 +03:00
Kevin Serrano	b9012a62e5	Merge branch 'master' into version-debugging	2017-10-05 17:06:55 -07:00
Kevin Serrano	e6a618b82d	Fix precision to account for small wei increase.	2017-10-05 15:26:03 -07:00
Dan Finlay	c5b7880f05	Merge branch 'master' into SignTypedData	2017-10-05 11:55:23 -07:00
Dan	583342bd56	Removes old/second setProviderType method from before merge (commit bd99bc2e)	2017-10-04 15:43:10 -07:00
Kevin Serrano	27c72ee565	Revert to normal balances.	2017-10-04 12:10:01 -07:00
Kevin Serrano	bb9c2b3563	lint	2017-10-04 11:14:30 -07:00
Kevin Serrano	52aee7aa9e	Further adjustment to maintain API	2017-10-04 11:07:16 -07:00
Kevin Serrano	b158d7fea0	Rename to maintain API	2017-10-04 11:00:52 -07:00
Kevin Serrano	3d80565339	Configured for callback-required function.'	2017-10-04 10:55:10 -07:00
Kevin Serrano	e64c64a049	change global to window	2017-10-04 10:00:07 -07:00
Kevin Serrano	2f135c2e68	Include browser version	2017-10-04 09:56:40 -07:00
Kevin Serrano	147b81068a	Include OS version	2017-10-04 09:56:18 -07:00
Chi Kei Chan	bd99bc2e88	Merge branch 'master' into NewUI-flat	2017-10-03 16:02:58 -07:00
Dan	ac4868170f	Enables remove token and ensures add/remove update the list without need for refresh.	2017-10-03 15:46:01 -07:00
Kevin Serrano	1893c50730	Merge pull request #2175 from MetaMask/RemoveSlackLink ... Remove slack link	2017-10-03 10:46:29 -07:00
Kevin Serrano	44949813de	Merge pull request #2251 from BrandenSoropia/remove-metamask-title ... Removed MetaMask title. Fixed #1730.	2017-10-03 10:15:33 -07:00
Dan	45dbd017e6	Add needed iterator in tx-list and path to account in selectors.	2017-10-02 18:09:45 -07:00
Dan	d206f183f5	Hide token confirmation modal ui	2017-10-02 18:09:09 -07:00
Sergey Ukustov	e11ca12890	Merge remote-tracking branch 'upstream/master'	2017-10-03 02:10:47 +03:00
kumavis	2113d83489	ui - tx history - simplify error+warning display code	2017-10-02 15:39:44 -07:00
Kevin Serrano	4b0e6a0a77	Merge branch 'master' into RemoveSlackLink	2017-10-02 15:23:27 -07:00
Branden Soropia	db1dd46f8d	Removed MetaMasktitle. Fixed #1730.	2017-10-02 00:02:30 -04:00
Dan	47ebcbb2ed	Token menu ui.	2017-10-01 19:02:21 -07:00
Dan	ff64fe98dd	Shapeshift deposit tx modal.	2017-10-01 18:58:57 -07:00
Dan	7c4d8c4562	Enables the old shapeshift UI within new ui.	2017-10-01 18:58:57 -07:00
kumavis	a2b6d3ffc5	network - remove long dead etherscan provider code	2017-09-29 16:37:01 -07:00
kumavis	d6ea2fa425	network - convert localhost from custom rpc to network type	2017-09-29 16:35:58 -07:00
Sergey Ukustov	82d1f39198	Respect code style	2017-09-29 19:53:03 +03:00
Sergey Ukustov	c2b8dada91	Add eth_signTypedData handler	2017-09-29 19:40:46 +03:00
Chi Kei Chan	67ee5b21e6	Query for gas estimates	2017-09-28 17:39:53 -07:00
Chi Kei Chan	4f106854ba	Hide ShapeShift and Fix Modal Stylings	2017-09-28 16:34:42 -07:00
Chi Kei Chan	06292107d7	Always set currency to USD on app mount	2017-09-28 16:13:53 -07:00
Dan	66ed4dfaa3	Ensure sent token value is recognized as hex.	2017-09-28 15:55:18 -07:00
Dan	a195427e72	Fix send of USD and backspacing amount to 0	2017-09-28 15:54:51 -07:00
Dan	b55a40c7f1	Close sidebar on token selection.	2017-09-28 15:54:04 -07:00
Dan	a4838b1c57	Close mobile sidebar when selecting 'Add token' from account options dropdown.	2017-09-28 15:54:04 -07:00
Chi Kei Chan	5a1d50cd43	Merge branch 'master' into mmn	2017-09-27 22:32:07 -07:00
Dan	deee689426	Use font-awesome icons for create and import account.	2017-09-27 18:08:49 -07:00
Dan	c2ccd6e90e	Makes styling fixes to account dropdown.	2017-09-27 18:08:49 -07:00
Dan	10345a12c2	Keep privateKey out of state and clear it after closing export private key modal.	2017-09-27 18:06:26 -07:00
Dan	01816e1b22	Adds a back button to export private key modal; connects account details to same modal.	2017-09-27 18:06:26 -07:00
kumavis	15b2823e54	Merge branch 'master' into new-currency-test	2017-09-27 16:04:51 -07:00
tmashuang	734490c58c	Add AUD, HKD, SGD, IDR, PHP to currency conversion list	2017-09-27 11:16:38 -07:00
Chi Kei Chan	c77029ea90	Implement Confirm Deploy Contract screen	2017-09-26 19:21:04 -07:00
Dan	39365f2cc4	Update the correct values in state when estimates are received.	2017-09-26 18:43:26 -07:00
Dan	541b69dda9	Gets gas and price estimates when send components mount.	2017-09-26 18:43:26 -07:00
Dan	25c2865076	Restore notification functionality	2017-09-26 18:42:39 -07:00
Kevin Serrano	e998d528f0	Merge branch 'master' into RemoveSlackLink	2017-09-26 15:47:31 -07:00
Kevin Serrano	accee14282	Remove old conversion list.	2017-09-26 10:35:13 -07:00
Kevin Serrano	7b199e215d	Polish names on currency list.	2017-09-26 10:11:18 -07:00
Kevin Serrano	88ddedfb5a	Account for undefined currencies.	2017-09-26 10:09:50 -07:00
Dan Finlay	57b5f15265	Remove slack link	2017-09-26 10:01:16 -07:00
Chi Kei Chan	bdd1e58e55	Return null if transaction.key is shapeshift	2017-09-26 09:15:14 -07:00
Dan	7102772c3a	Connect export key modal to state and enable actions.	2017-09-26 09:05:29 -07:00
Chi Kei Chan	0d4433ed58	Merge branch 'NewUI-flat' into MM-57-use-gas-estimator	2017-09-25 19:55:56 -07:00
Dan	5f6ec6aa98	Remove unnecessary trailing comma.	2017-09-25 18:30:56 -07:00
Dan	56697ea9a4	Select all in to and from of send screens, instead of clearing on focus.	2017-09-25 18:30:56 -07:00
Dan	eae40e0544	Able to change selections in to and from fields of send and send token.	2017-09-25 18:30:56 -07:00
Dan	2c474b0d6e	Export private key modal body ui.	2017-09-25 18:29:43 -07:00
Dan	fc3e071ad6	Send token now estimates gas and price.	2017-09-25 22:09:10 -02:30
Dan	79bcb88db3	Refactor to store estimated gas and price in local state, return promise from actions.	2017-09-25 21:54:55 -02:30
Dan	88c4226bf1	Estimate gasPrice and gasLimit in send screen.	2017-09-25 21:54:55 -02:30
Dan	a1d87b821b	Update send token to handle errors onBlur events and prevent clicking send until all errors handled	2017-09-25 21:45:51 -02:30
Dan	171d38c8db	Handles errors with to field and renders warnings from backend in send token.	2017-09-25 21:19:30 -02:30
Dan	0eeba3771c	Exports private key modal opens from dropdown.	2017-09-23 17:33:50 -07:00
Chi Kei Chan	e1077836ce	Add Confirm Send token screen	2017-09-22 14:38:17 -07:00
Dan	13f22ff6b0	get identities from getState() instead of passing from caller, only set new account label if label set.	2017-09-22 14:35:51 -07:00
Dan	a1d72a59fe	New account modal now allows for addition of account name.	2017-09-22 14:35:51 -07:00
Dan	e325e5e2f5	Default class params to empty string in readonly-input	2017-09-22 14:23:57 -07:00
Dan	48867d95fe	ReadOnlyInput component.	2017-09-22 14:23:57 -07:00
Dan Finlay	f9d2f523c6	Merge branch 'master' into AddBalanceController	2017-09-22 14:12:41 -07:00
Dan	fe37dd7ecd	Open account details modal on buy -> direct deposit.	2017-09-22 12:16:31 -07:00
Dan	14bdc5a78c	Client side error handling for from, to and amount fields in send.js	2017-09-22 12:10:30 -07:00
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
Kevin Serrano	9c7abacf64	Change cursor type to indicate link.	2017-08-15 12:26:11 -07:00
frankiebee	a8d6e1fe98	fix spelling	2017-08-15 12:16:41 -07:00
frankiebee	176dd6d214	Disable token list	2017-08-15 12:12:57 -07:00
sdtsui	6168efc9cc	Fix overflow issue on QubesOS, flagged by @kumavis	2017-08-15 17:13:11 +02:00
davidp94	f52ef5d496	fix goHome	2017-08-14 21:51:39 -07:00
davidp94	39424cdf45	remove unused action type	2017-08-14 21:35:57 -07:00
DavidNinja	399c51c048	cancel all txs	2017-08-14 21:29:21 -07:00
sdtsui	99be6e17ca	[WiP] Add comments for multiple modals	2017-08-15 05:46:41 +02: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	f2f2d35992	Remove unnecessary imports, and account-detail.js	2017-08-14 08:40:25 +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	b900da885e	Fix odd relative position conflict so main icon is rounded - See flyswatter/jazzicon/issues/1	2017-08-14 07:34:57 +02:00
sdtsui	d01a663342	Remove unused code - network dropdown components in app	2017-08-13 22:20:58 +02:00
sdtsui	c60ea60ec9	Remove deprecated feature: main app settings dropdown	2017-08-13 22:16:22 +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
sdtsui	25184a3901	Move global modals into own pod, inside components/modals	2017-08-13 10:24:51 -07:00
sdtsui	9b48e0aa53	Implement infinite scrolls (no lazy loading) for wallet view	2017-08-11 09:17:14 -07:00
sdtsui	9954c95b4a	[WIP] Begin fixing responsive layout with many wallets	2017-08-11 00:42:44 -07:00
sdtsui	f23d8c7393	Allow fullscreen scrolling on mobile view, while retaining in-window scroll for laptop	2017-08-11 00:42:09 -07:00
sdtsui	0fab1b5482	Implement responsive wallet balances	2017-08-11 00:31:06 -07:00
sdtsui	8a39941d9a	Cleanup SCSS and improve organization of color vars	2017-08-10 23:21:39 -07:00
sdtsui	58b61eb1fc	Add UI tweaks, including separation of overflow logic for mobile (full-height) vs laptop (tx-view-only)	2017-08-10 22:47:56 -07:00
sdtsui	7a664a7f72	Improve text positioning on mobile view	2017-08-10 22:16:42 -07:00
sdtsui	3188cc2ef0	Extract scss breakpoints into variables	2017-08-10 22:16:25 -07:00
sdtsui	e31c298288	Implement widescreen layout for tx list	2017-08-10 20:52:22 -07:00
sdtsui	f9432c5982	Move Txs list item styles into classes	2017-08-10 19:55:01 -07:00
sdtsui	d53780bcdc	Add new color for txs - dusty-gray	2017-08-10 19:54:42 -07:00
sdtsui	96b186dfb2	Cleanup txList and txView components	2017-08-10 19:35:10 -07:00
sdtsui	77b72ee33f	Add selectors for txsToRender and conversionRate	2017-08-10 19:35:01 -07:00
sdtsui	9ec8663605	Cleanup stray logs and lint	2017-08-10 17:50:33 -07:00
sdtsui	2346c9b6b9	Add overflow support for all account names in account details	2017-08-10 17:49:12 -07:00
sdtsui	771f9ec124	Fix logic for dropdown components attaching checkmark to correct account	2017-08-10 17:37:55 -07:00
sdtsui	88f4931c6f	Fix text overflow for dropdown components flagged by @frankiebee	2017-08-10 17:37:36 -07:00
Simon Liang	95eda70efe	added logging for account balance	2017-08-10 16:52:26 +08:00
Simon Liang	708d8398f4	reverted my changes	2017-08-10 14:48:05 +08:00
Simon Liang	a3f96951c2	connected wallet view dropdown button with real data	2017-08-10 14:47:17 +08:00
Simon Liang	53c91591b3	redid tx-view and balance-component mapStateToProps logic	2017-08-10 14:43:01 +08:00
Simon Liang	87cb930130	moved the props initialization steps into mapStateToProps	2017-08-10 14:43:01 +08:00
Simon Liang	9d36b25c5f	extracted transaction list	2017-08-10 14:43:01 +08:00
Simon Liang	72df9746fa	removing styling comments	2017-08-10 14:43:01 +08:00
sdtsui	779be75370	[WIP] Position account potions dropdown correctly and hook up to action creators	2017-08-09 21:42:16 -07:00
sdtsui	be116ecfbd	Add new selectors for addresses, identities, and accounts	2017-08-09 21:42:16 -07:00
sdtsui	5f74564deb	Adjust modal styles to match new modal size, from cancel button tweak	2017-08-09 21:42:16 -07:00
sdtsui	50f8535f7b	Switch buy modal 'cancel' from text to button for accessibility	2017-08-09 21:42:16 -07:00
sdtsui	231b8a7542	Vertically center modal in mobile view - @cjeria	2017-08-09 21:42:16 -07:00
sdtsui	cba50818c2	Improve layout of buy buttons by tweaking text styles	2017-08-09 21:42:16 -07:00
Kevin Serrano	45fc1d6ec3	Readd loose label onto accounts.	2017-08-09 17:40:01 -07:00
kumavis	245125eb18	ui - buy eth - formatting and moved network names to config	2017-08-09 12:25:38 -07:00
kumavis	052d338b2b	lint fix	2017-08-09 01:04:42 -07:00
kumavis	897d00efa0	ui - buy eth - add dharma beta to kovan	2017-08-09 01:00:06 -07:00
kumavis	84c3d3c6db	ui - buy button view - refactor	2017-08-09 00:36:18 -07:00
kumavis	0188e7b94d	Merge branch 'master' into NewUI-flat	2017-08-08 23:30:58 -07:00
sdtsui	5e9926b0d0	Fix dropdown z-index value	2017-08-08 19:02:58 -07:00
sdtsui	6be6f56ac5	Add z indicies to settings-variables	2017-08-08 19:01:33 -07:00
sdtsui	67213e7583	Add backdrop styles and box shadow to new global modal defaults	2017-08-08 18:51:06 -07:00
sdtsui	bdf5436c2d	Add minor comments and cleanup for new components	2017-08-08 18:44:20 -07:00
sdtsui	c8893fb9ca	Hook up 'Buy with Fiat', redirect to Coinbase	2017-08-08 18:37:20 -07:00
sdtsui	dc702705bf	Move buy view into its own component - BuyOptions	2017-08-08 18:34:04 -07:00
sdtsui	eab5718a40	Add an additional font-size breakpoint for buy modal on the largest screens	2017-08-08 18:12:50 -07:00
sdtsui	3072d2d178	Add minor positioning tweaks for buy modal, laptop view	2017-08-08 17:57:47 -07:00
sdtsui	b97dcf09ac	Move inline styles out into explicitly named BEM classes	2017-08-08 17:51:06 -07:00
sdtsui	928adae104	Implement modal content for buy flow - mobile view	2017-08-08 17:11:25 -07:00
kumavis	922ecb9149	Merge branch 'master' into greenkeeper/initial	2017-08-08 16:23:14 -07:00
kumavis	7db1f30590	Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layout ... Improve layout for legacy buy screen	2017-08-08 15:56:02 -07:00
sdtsui	9d3b5348aa	Fix layout issues flagged by @tmashuang	2017-08-08 15:17:52 -07:00
sdtsui	b6a7281737	Make buy ui more central to the screen	2017-08-08 15:17:24 -07:00
Thomas Huang	67e4855b9d	Updated commonjs require path for redux-logger and redux-thunk modules	2017-08-08 14:15:45 -07:00
sdtsui	922a272e81	Add note for responsive modal styles	2017-08-08 14:05:19 -07:00
sdtsui	29c8f448ca	Hook up global modal to Tx view, Buy button	2017-08-08 13:37:52 -07:00
sdtsui	f72f57dc6c	Implement global modal	2017-08-08 13:37:41 -07:00
sdtsui	aab0fda9ac	Add actions and reducers for global modal	2017-08-08 13:37:16 -07:00
Simon Liang	0db627d979	refactored and added unit test	2017-08-08 20:15:30 +08:00
Simon Liang	e8ade42f2a	extracted balance component and renders to the format, also wired in the account name	2017-08-08 16:49:45 +08:00
frankiebee	f3b42f1e33	Merge branch 'master' into transactionControllerRefractor	2017-08-07 16:24:58 -04:00
kumavis	78aa957e5a	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-07 10:52:08 -07:00
sdtsui	d8fff0fc8c	Opt for calculated values in absolutely positioned caret	2017-08-06 23:12:40 -07:00
sdtsui	0f140c5db5	Improve positioning of caret and add reusable color for wallet view	2017-08-06 22:30:27 -07:00
sdtsui	ba50411bb2	Position account icon, name, and caret	2017-08-06 21:54:42 -07:00
sdtsui	29662ff7b4	Move tx and wallet view styles to component classes	2017-08-06 20:47:59 -07:00
sdtsui	5c7adc911d	Merge branch 'NewUI' into feat/mm-ui-5-merged	2017-08-06 20:24:04 -07:00
sdtsui	02c2106c3b	Merge branch 'master' into feat/mm-ui-5	2017-08-06 19:55:34 -07:00
sdtsui	fd36d95c50	Cleanup before rebase on NewUI - need new version of AccountDropdowns	2017-08-06 19:52:13 -07:00
sdtsui	b3d7abd5d4	Allow clicks on account view to enable sidebar, not just burger	2017-08-06 19:29:51 -07:00
sdtsui	850d2124c8	Refactor account name css - mobile views	2017-08-06 19:26:52 -07:00
sdtsui	7cb031eeb9	Add sidebar click handler to overlay	2017-08-06 19:03:38 -07:00
sdtsui	a7017b824d	Refactor app-header css, including box shadow and z-index	2017-08-06 18:50:23 -07:00
sdtsui	403d9c52b5	Add fine css tweaks to hero balance - laptop	2017-08-06 18:14:48 -07:00
sdtsui	f06a18a09c	Adjust hero balance on mobile	2017-08-06 17:46:18 -07:00
sdtsui	ebf39831c4	Adjust size of buttons for 576-780+px range	2017-08-06 17:13:31 -07:00
sdtsui	dc0f78c1b9	Fix font size of eth display for 576-780px vw	2017-08-06 16:58:45 -07:00
sdtsui	c1b8517959	Normalize sidebar dimensions and adjust hero button responsiveness	2017-08-06 16:37:41 -07:00
sdtsui	802c29c986	Implement hero balance UI, mobile	2017-08-06 15:46:55 -07:00
sdtsui	17de77f24a	Position account display and burger in mobile tx view	2017-08-06 14:56:13 -07:00
sdtsui	c9b33da184	Disable debug styles	2017-08-06 14:25:34 -07:00
sdtsui	966b25573b	Move remaining debug, fonts, reset, and transitions into inverted triangle	2017-08-06 14:03:44 -07:00
sdtsui	f73e4dd604	Move debug and colors to itcss	2017-08-06 13:53:22 -07:00
sdtsui	2eddfec342	Remove output folder	2017-08-06 13:46:11 -07:00
sdtsui	38f53066f3	Remove unncessary sourcemaps from css output/	2017-08-06 13:26:00 -07:00
sdtsui	d46a79df25	Organize app components scss	2017-08-06 13:24:13 -07:00
sdtsui	b65dc85b0a	Organize app components	2017-08-06 13:06:18 -07:00
sdtsui	a0a956d646	Move generic button components and body styles to components and generic, respectively	2017-08-06 13:02:31 -07:00
sdtsui	04d1d86f30	Move old colors intro settings/variables	2017-08-06 12:49:02 -07:00
sdtsui	f0a219294d	Add inverted triangle css (itcss) folder structure	2017-08-06 12:45:21 -07:00
sdtsui	bc73cbdbfe	Cleanup css and gulpfile post-migration	2017-08-06 12:29:26 -07:00
sdtsui	3f222854e4	Migrate from css to scss + autoprefixer	2017-08-06 12:09:17 -07:00
sdtsui	b5251d22a6	Fix integration test failures: unnecessary sandwich-expando event stopPropagation	2017-08-04 23:34:26 -07:00
sdtsui	186bcec4fb	Lint menu-droppo	2017-08-04 13:31:18 -07:00
kumavis	5f8a2ea1e6	Merge pull request #1862 from sdtsui/add-rct ... Re-enable css transitions, only for dropdowns in app header	2017-08-04 13:22:25 -07:00
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	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
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
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	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