1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

3332 Commits

Author SHA1 Message Date
Dan Finlay
0fd32e67d4 Do not mark slowly mined txs as failed.
Fixes #1567

Also seems to fix #1556

Also improves resubmit performance by only resubmitting on `latest`.
2017-06-14 12:01:45 -07:00
Thomas Huang
1a4f982739 Merge pull request #1606 from MetaMask/ubuntu-warning
Warn Users about potential JSON import problems
2017-06-14 10:20:53 -07:00
Kevin Serrano
74d15f5cb0
Bump changelog. 2017-06-14 10:13:34 -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
42f8f32a52 Remove bad state file 2017-06-13 17:58:51 -07:00
Dan Finlay
5c9a228848 Add token list note to changelog 2017-06-13 17:57:18 -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
Dan Finlay
de500250c4 Fix build for eth-contract-metadata 2017-06-13 17:46:47 -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
dd7e11d196 Merge pull request #1598 from MetaMask/txRetry
put tx resubmission on the block event
2017-06-13 10:45:21 -07:00
frankiebee
ec3383c162 rename continuallyResubmitPendingTxs to resubmitPendingTxs 2017-06-13 09:50:01 -07:00
Frankie
eccb8b8f80 Merge pull request #1601 from MetaMask/ChainIdErrorTest
Chain id error test
2017-06-12 19:34:43 -07:00
Thomas Huang
c0f07844af Finish async when failing async test 2017-06-12 17:52:37 -07:00
Thomas Huang
ae7c296669 Fix networkState in chain id 2017-06-12 17:44:11 -07:00
Thomas Huang
dbc48c3992 Make test Async 2017-06-12 17:42:54 -07:00
Dan Finlay
a741cc4fc4 Merge branch 'master' into AddTokenList 2017-06-12 17:17:16 -07:00
Kevin Serrano
e9e43637df
Bump changelog. 2017-06-12 16:57:31 -07:00
Kevin Serrano
5e03b69892
Fix check icon appearing in inappropriate situations. 2017-06-12 16:56:37 -07:00
kumavis
bbe0c73dca Merge pull request #1597 from MetaMask/Version-3.7.8
Version 3.7.8
2017-06-12 16:20:04 -07:00
frankiebee
96fa29ffbc put tx resubmission on the block event 2017-06-12 16:11:37 -07:00
Dan Finlay
844159cb18 Version 3.7.8 2017-06-12 15:57:01 -07:00
kumavis
16593d0b9d Merge pull request #1592 from MetaMask/qrPrefix
prefix the address with "ethereum:"
2017-06-12 15:23:53 -07:00
Frankie
3da887e56e Merge branch 'master' into qrPrefix 2017-06-12 15:09:53 -07:00
frankiebee
b712e7ce64 add to CHANGELOG 2017-06-12 14:48:55 -07:00
frankiebee
d1fa3c6de1 only prefix ethereum address 2017-06-12 14:38:26 -07:00
Frankie
33a32bb06b Merge pull request #1594 from MetaMask/prov-eng-bump
deps - prov-eng 12.2.4
2017-06-12 14:24:15 -07:00
kumavis
3b3c96ef34 Merge pull request #1208 from MetaMask/i#1203MainNetSwitch
Change default to mainnet
2017-06-12 14:22:07 -07:00
kumavis
9fd9c34574 deps - prov-eng 12.2.4 2017-06-12 14:09:38 -07:00
frankiebee
5668910244 prefix the address with "ethereum:" 2017-06-12 14:05:08 -07:00
kumavis
c0a023ffdb default testnet - fix typo 2017-06-12 13:46:56 -07:00
Frankie
670fbf6da0 Merge pull request #1591 from MetaMask/ignore-package-lock
gitignore - add package-lock and re-arrange by category
2017-06-12 13:45:14 -07:00
kumavis
e8d5d85a16 gitignore - remove cached package-lock 2017-06-12 13:34:02 -07:00
Frankie
fe87a908ff Merge pull request #1585 from MetaMask/t-lint
Lint Fixes
2017-06-12 13:33:09 -07:00
kumavis
997f38c219 gitignore - add package-lock and re-arrange by category 2017-06-12 13:30:59 -07:00
kumavis
27220b7bcd Merge branch 'master' into i#1203MainNetSwitch 2017-06-12 13:27:04 -07:00
Thomas Huang
13e6672028 Linting 2017-06-12 11:08:32 -07:00
Dan Finlay
8af41f1b05 Merge pull request #1574 from MetaMask/internfix
Wording fix for notice button
2017-06-12 10:37:46 -07:00
kumavis
2d5a672971 Merge pull request #1572 from MetaMask/mascaraUpkeep
Mascara upkeep
2017-06-12 10:36:48 -07:00
Dan Finlay
4298d80127 Merge pull request #1552 from MetaMask/currency-fix
Fix Currency API
2017-06-12 10:36:36 -07:00
Dan Finlay
7057c24471 Merge pull request #1570 from MetaMask/addfaq
Modify FAQ to be more visible.
2017-06-12 10:36:16 -07:00
Dan Finlay
ba254d9041 Merge branch 'master' into currency-fix 2017-06-12 10:32:54 -07:00
Dan Finlay
2e6e6e4125 Merge pull request #1535 from MetaMask/gasupdater
Update GasBlockLimits on every new block
2017-06-12 10:30:25 -07:00
Dan Finlay
3e1d648ec0 Merge branch 'master' into gasupdater 2017-06-12 10:26:40 -07:00
Kevin Serrano
2fcf3d8439
Modify wording to new accept. 2017-06-09 10:48:28 -07:00
frankiebee
3d1d38a2c0 reload page if ui is not present 2017-06-08 17:36:21 -07:00
frankiebee
a0a19468a8 reload the page when switching networks 2017-06-08 17:34:51 -07:00
frankiebee
4941b5ab11 bump cswready event 2017-06-08 17:33:27 -07:00
frankiebee
1a70141e8b clean up code 2017-06-08 17:32:50 -07:00