4295 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Finlay	c76194d7c3	Move mock txs to tx mocking class	2017-08-21 11:35:51 -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
Thomas Huang	9203b4edf9	Merge pull request #1946 from MetaMask/Version-3.9.9 ... Version 3.9.9	2017-08-18 16:38:00 -07:00
Dan Finlay	f24cfea35e	Version 3.9.9	2017-08-18 16:12:36 -07:00
frankiebee	1ffb406480	break out network nonce calc.	2017-08-18 16:05:21 -07:00
frankiebee	37f86e874f	fix 0x0 nonce calc.	2017-08-18 15:44:32 -07:00
frankiebee	f8eca95ca5	include pendingTxs in localNonce	2017-08-18 15:01:05 -07:00
frankiebee	a5a32f3d57	use "localNonce" when the network returns a nonce that is lower then a known confirmed tx	2017-08-18 13:54:16 -07:00
frankiebee	bf8a62eb39	add test for using localNonce	2017-08-18 13:53:18 -07:00
Dan Finlay	e0c35179c2	Merge pull request #1914 from MetaMask/history-diff ... Move Tx State History to diff-based format	2017-08-18 13:14:17 -07:00
Kevin Serrano	729233a288	Merge pull request #1941 from MetaMask/i1912-TokenPrecisionFix ... Fix token balance precision rendering	2017-08-18 10:55:07 -07:00
Kevin Serrano	7e6c714f78	Merge branch 'master' into i1912-TokenPrecisionFix	2017-08-18 10:48:55 -07:00
Thomas Huang	31e5a4f050	Merge pull request #1942 from MetaMask/i1903-EthSignFormat ... Fix "Eth Sign" format	2017-08-17 15:52:39 -07:00
Dan Finlay	c90ff2847f	Bump changelog	2017-08-17 15:35:52 -07:00
Dan Finlay	98bedfabf9	Fix eth sign formatting	2017-08-17 15:35:17 -07:00
Dan Finlay	d7a34514b0	Fix token balance precision rendering ... Fixes a bug where balances under 1 token could be mis-rendered by fixing it [here](https://github.com/MetaMask/eth-token-tracker/pull/9) then updating us to `eth-token-tracker@1.1.3`. Fixes #1912	2017-08-17 14:53:08 -07:00
Frankie	5f9862c89e	Merge pull request #1935 from MetaMask/i1091-ShowTxErrors ... Transition home after tx errors	2017-08-17 10:29:08 -07:00
Dan Finlay	f684b53b69	Remove dead tests	2017-08-16 17:17:05 -07:00
Dan Finlay	e3a5c3684d	Bump changelog	2017-08-16 17:06:45 -07:00
Dan Finlay	343a7e9cce	Transition to home view after tx error	2017-08-16 17:06:21 -07:00
Thomas Huang	9b57c77cb8	Merge pull request #1933 from MetaMask/Version-3.9.8 ... Version 3.9.8	2017-08-16 16:35:20 -07:00
Dan Finlay	27d030b1a1	Version 3.9.8	2017-08-16 15:43:34 -07:00
Kevin Serrano	0477e08a6d	Merge pull request #1928 from MetaMask/RemoveDefaultTokens ... Remove default tokens	2017-08-16 13:38: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	c6cfa2157b	Bump changelog	2017-08-16 09:49:44 -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	60fdbd67af	Merge pull request #1921 from MetaMask/v3.9.7 ... Version 3.9.7	2017-08-15 14:33:23 -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
kumavis	33bdf86a2b	v3.9.7 update changelog	2017-08-15 12:58:53 -07:00
kumavis	474b037de6	v3.9.7	2017-08-15 12:47:35 -07:00
Kevin Serrano	f2ee32ba33	Merge pull request #1918 from MetaMask/token-hotfix ... Token hotfix	2017-08-15 12:42:54 -07:00
Kevin Serrano	9c7abacf64	Change cursor type to indicate link.	2017-08-15 12:26:11 -07:00