3755 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Finlay	bb24f07b17	When network nonce is highest, it should be used.	2017-08-21 11:59:51 -07:00
Dan Finlay	0f36e0e6da	Fix test	2017-08-21 11:57:42 -07:00
Dan Finlay	440101f2b5	Add new assertions and de-duplicate nonce tracker generation	2017-08-21 11:52:41 -07:00
Dan Finlay	306249e89e	Add test for no previous txs	2017-08-21 11:39:22 -07:00
Dan Finlay	f13c637b23	Confine mock strategy to describe block	2017-08-21 11:37:39 -07:00
Dan Finlay	c76194d7c3	Move mock txs to tx mocking class	2017-08-21 11:35:51 -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
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
frankiebee	a8d6e1fe98	fix spelling	2017-08-15 12:16:41 -07:00
frankiebee	be7f5bd365	Add to CHANGELOG	2017-08-15 12:13:06 -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
kumavis	68c6b2d666	Merge pull request #1904 from MetaMask/web3-depreciation ... Web3 depreciation warning	2017-08-12 14:12:01 -07:00
frankiebee	66a012550e	fix wording	2017-08-11 15:54:52 -07:00
frankiebee	d4849f67f9	Add to CHANGELOG	2017-08-11 15:53:01 -07:00
frankiebee	ac9e84ff40	add deprecation warning for web3	2017-08-11 15:52:03 -07:00
Frankie	3b1ac178ef	Merge pull request #1899 from sdtsui/fix/acct-name-lengths ... Fix account name overflow issues	2017-08-11 12:50:05 -04: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
Thomas Huang	4b7fa27ad0	Merge pull request #1894 from MetaMask/3.9.6 ... v3.9.6	2017-08-09 23:10:40 -07:00
kumavis	2b409fb60b	3.9.6	2017-08-09 23:05:50 -07:00