Commit Graph

7233 Commits

Author SHA1 Message Date
Bruno Barbieri 65a349dd30
Update config.yml 2018-07-06 00:21:04 -04:00
Bruno Barbieri 76912c8a0d
use sudo to install npm 2018-07-06 00:15:29 -04:00
Bruno Barbieri 1387f1c8c2
Another update 2018-07-06 00:14:33 -04:00
Bruno Barbieri 816b3a9d11
use package-lock only for the initial restore 2018-07-05 23:26:12 -04:00
Bruno Barbieri 170d05d2e6
Proper caching of node_modules 2018-07-05 22:11:58 -04:00
Dan Finlay 484a103099
Merge pull request #4738 from MetaMask/bmd/contrib-guidelines
update contributing.md
2018-07-05 17:52:45 -07:00
Bobby Dresser 29b3da6668 update contributing.md 2018-07-05 17:52:26 -04:00
Dan J Miller 6595f84d07
Merge pull request #4648 from MetaMask/update-import-from-seed-screen
Update import from seed screen on new ui.
2018-07-05 16:26:21 -02:30
Dan J Miller d3920007fa
Merge pull request #4694 from MetaMask/i4660-improve-send-token-error-ui
Improve send token error ux.
2018-07-05 16:25:59 -02:30
Dan f006cbf2ce Delete old restore vault file. 2018-07-05 14:44:08 -02:30
Whymarrh Whitby 60857f94ad
Merge pull request #4733 from whymarrh/fix-setstate-warnings
Fix setState warnings in components using TokenTracker
2018-07-05 13:59:46 -02:30
Whymarrh Whitby e59e92e028
Merge pull request #4734 from whymarrh/txlistitem-setstate-warning
Prevent calling setState in TxListItem after unmount
2018-07-05 13:59:25 -02:30
Dan J Miller 3c75be04a0
Merge pull request #4617 from TrejGun/fix-new-line
fix white spaces in signature
2018-07-05 13:55:18 -02:30
Dan J Miller b0214cbde3
Merge pull request #4735 from whymarrh/restore-vault-focus
Don't persist the seed phrase in the old UI restore flow
2018-07-05 13:47:35 -02:30
Whymarrh Whitby 2298daa53e Prevent calling setState in TxListItem after unmount 2018-07-05 13:17:53 -02:30
Whymarrh Whitby 46ee290114 Don't persist the seed phrase in the old UI restore flow 2018-07-05 13:07:38 -02:30
Dan J Miller d4bc943b01
Merge pull request #4686 from MetaMask/tweak-token-list-amount-style
Ensures token list amount is in its own row.
2018-07-05 12:39:26 -02:30
Whymarrh Whitby 783559f94e Don't update token balances after tracker is stopped 2018-07-05 10:54:51 -02:30
Whymarrh Whitby 0116ea9b95 Remove TokenTracker listeners when unmounting component 2018-07-05 10:54:51 -02:30
Dan 5d721665d3 Ensures token list amount is in its own row. 2018-07-05 08:07:41 -02:30
Dan J Miller 46cda26f3b
Merge pull request #4685 from MetaMask/estimate-gasprice-background-newui
Use background gas price estimation method in new ui.
2018-07-05 08:01:03 -02:30
Dan 7d7662191a Improve error and promise resolution handling in action.js updateGasData(). 2018-07-04 21:47:19 -02:30
Dan f262f0ea64 Update import from seed screen on new ui. 2018-07-04 21:21:12 -02:30
Dan J Miller fd218142ac
Merge pull request #4721 from MetaMask/i4666-gasLimit
fixes #4666 getGasLimit and getGasPrice removed and replaced
2018-07-04 17:22:14 -02:30
Dan c47a4ce2c9 Update new-ui-send integration tests to always explicitly set gas price. (e2e tests handle auto-setting and defaults) 2018-07-04 16:44:56 -02:30
Dan 0796fc58e4 Improve send token error ux. 2018-07-04 16:09:29 -02:30
Dan Finlay 68e1f22193
Merge pull request #4405 from PortalNetwork/portal-metamask
Integration ENS with IPFS
2018-07-04 11:05:16 -07:00
PhyrexTsai f38dc03b27
Merge pull request #4 from brunobar79/portal-metamask-lint-fix
Lint fix for Integration ENS with IPFS
2018-07-04 09:06:10 +08:00
Sara Reynolds 6bc7647c05 fixes 4666 2018-07-03 16:05:20 -07:00
Sara Reynolds d3c64358c5 :qw
:wq
q
2018-07-03 16:05:20 -07:00
kumavis 7d882fe491
Merge pull request #4719 from MetaMask/kumavis-patch-3
lint - ignore test-builds dir
2018-07-03 13:47:57 -07:00
Dan 7babacf062 Remove unnecessary anonymous function call in actions.js gas estimation. 2018-07-03 17:24:21 -02:30
kumavis b3b33b4697
Update .eslintignore 2018-07-03 12:43:14 -07:00
Bruno Barbieri e467eda4f7
Merge pull request #4718 from MetaMask/ignore-superstatic-vulnerability
ignore lodash vulnerability
2018-07-03 09:08:12 -10:00
Dan J Miller a049627752
Merge pull request #4716 from MetaMask/i4663-clearErrorMessages
fixes #4663 - Clear Error Messages when Importing Accounts are Successful
2018-07-03 16:03:55 -02:30
brunobar79 13b03ec090 fix lint errors 2018-07-03 14:29:36 -04:00
brunobar79 595447ccac Merge remote-tracking branch 'upstream/develop' into HEAD 2018-07-03 14:21:17 -04:00
Dan Finlay 2e9bd7e9d1
Merge pull request #4717 from MetaMask/chrome-promise-bugfix
Conditionally use Promise-based extension API when creating windows
2018-07-03 11:16:35 -07:00
Dan J Miller 8def5281b4
Merge pull request #4654 from TrejGun/bignumber
fixes #4307 BigNumber casting issue
2018-07-03 15:18:04 -02:30
brunobar79 160bc4daa4 ignore lodash vulnerability 2018-07-03 13:46:50 -04:00
Alexander Tseung 3fd5af636f
Merge pull request #4633 from MetaMask/i4580-import-account-errors
Show all errors on account creation screen.
2018-07-03 07:43:40 -10:00
bitpshr badf0ce314 Conditionally use Promise-based extension API when creating windows 2018-07-03 13:33:13 -04:00
Dan J Miller 4bdd59b055
Merge pull request #4699 from TrejGun/removeLeadingZeroes
move removeLeadingZeroes to utils, add test
2018-07-03 15:01:48 -02:30
Sara Reynolds d126887bc3 fixes 4663 2018-07-03 09:50:59 -07:00
kumavis 1f0cf11af1
Merge pull request #4712 from MetaMask/lint-fix
Lint - Lint all the things (without conflicts!)
2018-07-03 09:40:25 -07:00
brunobar79 53f1072ff4 fix contract-test 2018-07-02 22:20:51 -04:00
brunobar79 4b398701c1 fix unit tests 2018-07-02 21:03:34 -04:00
brunobar79 c734e486a0 fix tests 2018-07-02 20:21:27 -04:00
brunobar79 b4107a505b fix warning for new-ui screen tests 2018-07-02 20:13:04 -04:00
brunobar79 0da41263ac fix warning for unit tests 2018-07-02 20:12:50 -04:00