Commit Graph

710 Commits

Author SHA1 Message Date
Dan Finlay dcbecdc1fd
Merge pull request #2796 from MetaMask/filter-case-sensitive
bugfix: deps - eth-json-rpc-filters@1.2.5
2018-01-08 15:40:39 -08:00
kumavis ab7701efb3 provider - infura - use infura REST api 2018-01-08 14:57:57 -08:00
kumavis 2147b8a59a
Merge pull request #2854 from MetaMask/UpdateVinyl-BufferPackage
Update vinyl-buffer to version 1.0.1
2018-01-08 12:40:54 -08:00
greenkeeper[bot] d12c289e91 chore(package): update gulp-watch to version 5.0.0 2018-01-07 05:53:33 +00:00
Dan Finlay 4bca98d588 Derive gas price estimate from previous transactions
Return the 50th percentile lowest gas price of the previous 20 blocks.
2018-01-05 21:24:20 -08:00
Thomas Huang a6760fca25 Update vinyl-buffer to version 1.0.1 2018-01-04 06:40:38 -06:00
Alexander Tseung be398500de
Merge pull request #2848 from MetaMask/NewUI-flat
[NewUI] Merge NewUI-flat into uat
2018-01-03 13:24:17 -08:00
Alexander Tseung a6f062a686 Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c 2018-01-03 11:06:08 -08:00
Alexander Tseung dfb2247108 Fix sign typed data 2017-12-29 13:17:26 -08:00
greenkeeper[bot] 37789f2dba chore(package): update vinyl-source-stream to version 2.0.0 2017-12-23 05:35:28 +00:00
Alexander Tseung 409d1d30e9
Merge pull request #2799 from MetaMask/NewUI-flat
Update UAT to version 4.0.5
2017-12-22 11:40:20 -08:00
kumavis 023b5c84c4
deps - eth-json-rpc-filters@1.2.5
fix case sensitive address check in filters
2017-12-22 10:15:38 -08:00
greenkeeper[bot] e81ba29359 chore(package): update karma to version 2.0.0 2017-12-21 16:45:03 +00:00
Dan 7915e62d65 Merge branch 'master' into NewUI-flat 2017-12-20 19:16:12 -03:30
Thomas Huang c6e7bc0a5d Add exit flag to mocha to exit after tests run 2017-12-15 14:41:58 -06:00
Alexander Tseung d905b86ba7 Add prop-types to package.json, redirect from create-password screen when isInitialized 2017-12-14 14:11:23 -08:00
Alexander Tseung e226b10a89 Add react-router to allow use of the browser back button 2017-12-14 12:50:20 -08:00
kumavis 161aa66cb4 Revert "Revert "network - for infura networks use the infura block tracker provider""
This reverts commit 5df7dcd758.
2017-12-13 18:57:27 -08:00
kumavis adb3de5283 Merge branch 'master' of github.com:MetaMask/metamask-plugin into infura-block-tracker 2017-12-13 18:56:27 -08:00
kumavis 222e80dbbe deps - bump eth-json-rpc-infura 2017-12-13 18:43:12 -08:00
Frankie 5df7dcd758
Revert "network - for infura networks use the infura block tracker provider" 2017-12-13 17:46:56 -08:00
kumavis 33e6befdaa network - for infura networks use the infura block tracker provider 2017-12-13 13:51:36 -08:00
Dan Finlay 1ebd5140aa Version 3.13.2 2017-12-09 20:00:54 -05:00
Dan ec6c3c33bd Merge branch 'master' into NewUI-flat-merge-with-master 2017-12-06 21:11:52 -08:00
Thomas Huang c30b543a80
Merge pull request #2630 from MetaMask/i2624-VersionedNotices
Versioned notices
2017-11-29 17:25:10 -06:00
kumavis 327651e7fb Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix 2017-11-29 08:27:47 -10:00
Dan Finlay f0f6bb28e0 Get notice version filtering working nicely 2017-11-28 15:16:04 -08:00
kumavis f64bc3c01a deps - obs-store@3 + migrate stream plumbing 2017-11-28 11:09:18 -10:00
Thomas Huang 2b1f2557c7
Merge pull request #2615 from jpclark/NewUI-flat
Provide blockie identicon option
2017-11-28 13:58:06 -06:00
Dan Finlay e89f82399f Add optional version field to notices
Allows notices to only show to users who are on a certain version.
2017-11-28 11:14:57 -08:00
Thomas Huang 698e9ba441 Update greenkeeper deps for master 2017-11-27 13:49:49 -06:00
Thomas Huang 9b25f89728 Update babelify to 8.0.0 2017-11-27 12:35:19 -06:00
Jason Clark a34362b776 Fixes changes requested in pullrequestreview-79088534 2017-11-27 08:11:48 -07:00
Thomas Huang 109050817a Update react, react-dom, and react-test-renderer to 15.6.2 2017-11-27 08:46:47 -06:00
Thomas Huang 1ee91a51cc Update ethjs-query to v0.3.1 2017-11-26 10:46:28 -06:00
Thomas Huang 178b657c75 Update Qunit to QunitJS v2.4.1 2017-11-26 10:03:17 -06:00
Thomas Huang cefe6cded6 Update to Enzyme 3.2.0 2017-11-25 18:37:12 -06:00
Jason Clark 1b89ceb63a swapped out ethereum-blockies lib for MEW blockies library, tightened up identicon.js code 2017-11-25 14:33:42 -07:00
Jason Clark dc7bd3c628 incremental commit of working blockie component 2017-11-24 13:48:56 -07:00
Jason Clark fc46a16a32 toggle wired up to preferences property store 2017-11-24 10:35:17 -07:00
Clark, Jason (Contractor) 90fc4812bc incremental commit 2017-11-23 18:33:44 -07:00
greenkeeper[bot] fac516e5eb fix(package): update react-markdown to version 3.0.0 2017-11-20 09:08:48 +00:00
frankiebee 08867874cc Merge remote-tracking branch 'origin/uat' into mascara-first-screen 2017-11-07 12:29:47 -05:00
Dan acc973d543 Update classnames for integration tests and add output/index.css to integration test for ci 2017-11-02 15:16:43 -07:00
Dan b7653e8207 Get current NewUI-flat tests working. 2017-11-02 15:16:43 -07:00
Dan 56e9f98bd0 More lint fixes 2017-11-02 09:45:59 -02:30
frankiebee 5f7bc85c3d fix mascara build 2017-10-31 14:02:27 -05:00
Chi Kei Chan 301c737bbc Merge branch 'master' into NewUI-flat 2017-10-24 16:56:49 -07:00
Kevin Serrano 1767dceba4 Merge pull request #2422 from watilde/fixes-lint
Fixes lint warnings
2017-10-24 16:53:54 -07:00
Chi Kei Chan 7c20011023 Merge branch 'master' into NewUI-flat 2017-10-24 16:50:25 -07:00
tmashuang 91b23246cd Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin into firsttimeflow 2017-10-24 08:36:02 -07:00
Kevin Serrano 721019bc2b
Temporarily reversal of json-rpc-engine 2017-10-21 14:47:12 -07:00
Daijiro Wachi c1eb8f16dc Add lint:fix command to gulp and npm-scripts 2017-10-21 21:04:24 +02:00
Chi Kei Chan 5484e68896 Add Integration Tests 2017-10-20 21:51:37 -07:00
Chi Kei Chan ac50db52a9 Fix linter 2017-10-20 21:51:37 -07:00
Chi Kei Chan 5aaa2d679b Add ShapeShift UI 2017-10-20 21:51:37 -07:00
Chi Kei Chan c6a3d00d80 Fix merge conflict; separate onboarding buy screen 2017-10-20 21:51:37 -07:00
Chi Kei Chan e88baff2ee Add missing presets 2017-10-20 21:51:37 -07:00
Jacky Chan 638bbe0428 Shuffle tokens 2017-10-20 21:51:37 -07:00
Jacky Chan 1a9b217558 Add BackupPhraseScreen 2017-10-20 21:51:37 -07:00
Jacky Chan e1497fafa6 Add UniqueImageScreen 2017-10-20 21:51:37 -07:00
kumavis 61e1b821d4 Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-fix-maybe 2017-10-20 12:31:40 -07:00
kumavis 8472ca406a deps - bump eth-json-rpc-filters for log filter fix 2017-10-20 12:29:12 -07:00
Chi Kei Chan 344b467d03 Merge branch 'master' into NewUI-flat 2017-10-20 11:05:10 -07:00
Thomas Huang c24e266118 Merge branch 'master' into i2348-SelectAccountOnNewVault 2017-10-20 09:04:57 -04:00
Chi Kei Chan 69d8359639 Update eth-keyring-controller dependency 2017-10-19 17:48:45 -07:00
Dan Finlay 942de9ba02 Patch sandwich-expando for security update 2017-10-19 09:47:48 -07:00
Chi Kei Chan c8c773d641 Merge branch 'NewUI-flat' into merge 2017-10-18 22:58:46 -07:00
kumavis 209db9ae5f deps - bump eth-json-rpc-filters 2017-10-18 19:53:48 -07:00
Dan Finlay 21bde66e16 Remove account-tracker from keyringController 2017-10-18 17:14:26 -07:00
Kevin Serrano 5bdee96e73 Merge pull request #2368 from MetaMask/greenkeeper/react-simple-file-input-2.0.0
Update react-simple-file-input to the latest version 🚀
2017-10-18 17:10:30 -07:00
kumavis 8da0d0b28a Revert "NetworkController refactor for new EthClient interface" 2017-10-18 15:09:32 -07:00
Kevin Serrano d9f5e6beb2 Merge pull request #2370 from MetaMask/MoveOutEtherscanLinkGeneration
Move etherscan link logic into module
2017-10-16 11:31:05 -07:00
Dan Finlay c77bc5d408 Bump version on eth-simple-keyring
Fixes bug where imported accounts could not use the new `signTypedData` method.
2017-10-16 04:12:51 -07:00
Dan Finlay 06094c914b Move etherscan link logic into module 2017-10-14 11:23:44 -04:00
greenkeeper[bot] 970fbd797a fix(package): update react-simple-file-input to version 2.0.0 2017-10-14 12:05:00 +00:00
greenkeeper[bot] 19c375fa69 fix(package): update metamascara to version 2.0.0 2017-10-13 19:22:02 +00:00
Dan 7ec77e0b45 Refactor amount input: dynamic input width with vanilla js. 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
kumavis 5c5f9297f7 deps - bump eth-rpc-client for fix 2017-10-11 18:36:25 -07:00
kumavis 4096ec9f69 deps - bump eth-json-rpc-middleware for fix 2017-10-10 20:20:12 -07:00
kumavis 0f8d7dacb1 network-controller - use obj-proxy for providerProxy 2017-10-10 17:26:44 -07:00
kumavis efa92a7fc5 network controller - refactor to use eth-rpc-client 2017-10-10 14:13:12 -07:00
Sergey Ukustov a1696f89a8 Validate data format for eth_signTypedData 2017-10-07 00:38:13 +03:00
Dan Finlay c821a6b93a Bump provider-engine for better sender validations 2017-10-05 14:48:40 -07:00
Dan Finlay 176d03b2e8 Require keyring-controller 2.1.0 2017-10-05 14:39:23 -07:00
Dan Finlay 88686a3968 Enforce 0x prefix on accounts with new hd keyring 2017-10-04 15:35:46 -07:00
kumavis 23bc92a8f1 deps - bump eth-json-rpc-filters for log filter fix 2017-10-04 13:33:50 -07:00
Chi Kei Chan bd99bc2e88 Merge branch 'master' into NewUI-flat 2017-10-03 16:02:58 -07:00
Thomas Huang f12504cd09 Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0
Update coveralls to the latest version 🚀
2017-10-03 12:35:25 -07:00
greenkeeper[bot] 98641f6f66 chore(package): update mocha to version 4.0.0 2017-10-03 04:33:04 +00:00
kumavis e682611301 deps - bump pe for block cache fix 2017-10-02 11:35:26 -07:00
Chi Kei Chan 67ee5b21e6 Query for gas estimates 2017-09-28 17:39:53 -07:00
greenkeeper[bot] f69cf1670f chore(package): update coveralls to version 3.0.0 2017-09-28 17:02:58 +00:00
Chi Kei Chan 5a1d50cd43 Merge branch 'master' into mmn 2017-09-27 22:32:07 -07:00
kumavis cdf41c2857 Merge pull request #2124 from MetaMask/breakout-mascara
require metamascara
2017-09-27 16:27:01 -07:00
Dan Finlay 112c223930 Merge pull request #2196 from MetaMask/express-bump
deps - bump express for security fix
2017-09-27 15:26:53 -07:00
kumavis cd0f44e2d6 deps - bump express for security fix 2017-09-27 14:59:10 -07:00
greenkeeper[bot] c0d7d44764 fix(package): update eth-keyring-controller to version 2.0.0 2017-09-27 21:54:46 +00:00
Dan Finlay e72083f6e8 Merge branch 'master' into filter-fixes-moar 2017-09-27 10:57:02 -07:00
kumavis 1877c0766c Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController 2017-09-26 21:42:30 -07:00
Thomas Huang d135c3c9ca Merge pull request #2174 from MetaMask/i2162-TokenPrecision
Fix token precision bug
2017-09-26 11:32:32 -07:00
Dan Finlay b46cb3ecb5 Fix token precision bug
Had fixed this before in the dependency, but hadn't merged in that version bump yet :(

Fixes #2162
2017-09-26 09:25:04 -07:00
greenkeeper[bot] e52d52b22e chore(package): update sinon to version 4.0.0 2017-09-26 08:22:48 +00:00
frankiebee 4979f5902f bump metamascara version 2017-09-22 20:04:58 -07:00
kumavis 8ad74cf93a deps - bump filter deps and add random missing deps 2017-09-22 15:16:42 -07:00
Dan Finlay 443b1a8eb7 Remove keyring controller from project 2017-09-22 14:38:40 -07:00
kumavis 15195bca75 deps - bump provider engine for block tracker 2017-09-22 14:20:44 -07:00
kumavis 2ca2df1832 deps - bump eth-block-tracker 2017-09-22 13:58:46 -07:00
Dan Finlay e9b7fd9018 Patch security update 2017-09-22 10:41:14 -07:00
Chi Kei Chan 0204aa2001 Add Add Token UI; Add Fuzzy search for tokens 2017-09-19 21:18:36 -07:00
frankiebee 418f01411e mascara: turn off background 2017-09-19 16:48:42 -07:00
frankiebee daeb7f6ad3 update metamascara 2017-09-19 12:58:51 -07:00
kumavis 77e02d264a Merge branch 'master' of github.com:MetaMask/metamask-plugin into json-rpc-engine-bump 2017-09-19 11:27:49 -07:00
kumavis b979c6a2f3 deps - bump json-rpc-middleware-stream 2017-09-19 11:22:55 -07:00
kumavis d2ded61cc9 deps - bump json-rpc-engine 2017-09-19 10:54:41 -07:00
frankiebee 90482934f1 Merge branch 'master' into breakout-mascara 2017-09-19 10:45:51 -07:00
frankiebee 29dd81d029 require metamascara 2017-09-18 19:08:02 -07:00
Chi Kei Chan a67d3ecd46 Merge branch 'master' into NewUI-flat 2017-09-18 18:13:15 -07:00
Frankie 6204afb156 Merge pull request #2119 from MetaMask/mascara-tests2
tests - integration - re-add mascara to normal run
2017-09-18 14:33:40 -07:00
kumavis eaa85f283d tests - integration - re-add mascara to normal run 2017-09-18 13:17:08 -07:00
Frankie bbae8d975e Merge pull request #2098 from MetaMask/mascara-tests
Integration test suite improvements
2017-09-18 12:54:39 -07:00
kumavis 784510f89f tests - integration - remove failing mascara integration tests from normal run until fixed 2017-09-18 12:31:44 -07:00
Chi Kei Chan 6c5865d564 Merge branch 'master' into nm 2017-09-18 11:28:10 -07:00
kumavis d2d6f6a858 tests - integration - add mascara to integration test run 2017-09-15 12:20:43 -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
kumavis 610f09262d tests - refactor and rename npm scripts 2017-09-13 17:17:09 -07:00
kumavis cbff5fd450 tests - mascara - move temp build files into dist/mascara 2017-09-13 16:52:38 -07:00
kumavis 56db3999ad tests - start migrating mascara tests to karma 2017-09-13 16:45:31 -07:00
kumavis dd90e8e364 tests - break out coveralls npm script 2017-09-13 16:04:48 -07:00
kumavis 245c0f0c27 metamask controller - move middleware into seperate files 2017-09-13 15:17:26 -07:00
Dan 6fa1cd6225 Reapply conversion utility changes and fix calls to utility in pending-tx. 2017-09-13 14:22:30 -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
Dan 080890a46e Overhaul currency conversion utility and update calls to utility in pending-tx. 2017-09-12 16:05:59 -07:00
tmashuang a79b4db06a E2E testing with selenium 2017-09-12 14:14:24 -07:00
kumavis 114dae5f80 Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix3 2017-09-12 11:51:22 -07:00
kumavis cafebb6417 Merge pull request #2073 from MetaMask/greenkeeper/babel-eslint-8.0.0
Update babel-eslint to the latest version 🚀
2017-09-12 11:50:47 -07:00
greenkeeper[bot] 985fb7b07c chore(package): update babel-eslint to version 8.0.0 2017-09-12 14:10:26 +00:00
Chi Kei Chan 7eb6dae418 Added signTokenTx; Adding token confirmation screen 2017-09-12 02:22:23 -07:00
kumavis 0e70366e9c test - integration - drop testem for karma 2017-09-11 22:29:40 -07:00
kumavis e9daf0eb28 test - integration - remove redundant testem scripts 2017-09-11 22:26:47 -07:00
kumavis ca035743c2 ci - dont attempt to submit coveralls if not configured 2017-09-11 22:25:46 -07:00
Chi Kei Chan 062e67bff8 Add buttons; handle back; add yarn.lock 2017-09-11 22:14:09 -07:00
kumavis 671dafea9e Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix 2017-09-07 22:37:44 -07:00
kumavis f5d0a0b07a deps - bump jsonrpc filters for log filter formate fix 2017-09-07 22:25:08 -07:00
kumavis 57e4805c62 streams - use pump and published obj-multiplex 2017-09-07 21:17:49 -07:00
kumavis 440a42bbc3 inpage - add idRemapMiddleware 2017-09-07 10:08:07 -07:00
Thomas Huang 33dfed15a6 Merge pull request #1897 from MetaMask/greenkeeper/sinon-3.2.0
Update sinon to the latest version 🚀
2017-09-01 12:05:08 -07:00
Dan 5452a26b36 Fixes lint errors and adds stylelint-config-standard to package.json 2017-08-31 04:16:07 -07:00
kumavis cc56d0d2f6 inpage - use json-rpc-engine for inpage-provider 2017-08-24 15:44:40 -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
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
kumavis fdffb6fedc introduce tx-state-history-helper and diff-based history 2017-08-14 18:46:04 -07:00
sdtsui dbc539ac55 Merge remote-tracking branch 'mm/master' into NewUI-flat 2017-08-14 11:06:14 +02:00
sdtsui b8aa529d29 [WIP] Add packages and tasks for linting scss 2017-08-14 10:03:16 +02:00
greenkeeper[bot] a15599108e chore(package): update sinon to version 3.2.0 2017-08-10 14:35:53 +00:00
kumavis fa6370c68a deps - bump ethjs-query 2017-08-09 16:18:38 -07:00
kumavis 0188e7b94d Merge branch 'master' into NewUI-flat 2017-08-08 23:30:58 -07:00
kumavis 6767430aa2 deps - bump watchify 2017-08-08 17:46:09 -07:00
kumavis 922ecb9149 Merge branch 'master' into greenkeeper/initial 2017-08-08 16:23:14 -07:00
frankiebee 88b84e3895 add json-rpc-engine && eth-json-rpc-middleware to devDependencies 2017-08-08 18:34:59 -04:00
sdtsui da51f56df9 Add dependencies and JSX support (reactify), for global modal implementation 2017-08-08 13:36:54 -07: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 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 3f222854e4 Migrate from css to scss + autoprefixer 2017-08-06 12:09:17 -07:00
kumavis a456baea8b Merge branch 'master' into NewUI 2017-08-05 00:29:10 -07:00
kumavis c62dad7248 blacklist - bump phishing detector 2017-08-04 14:11:40 -07:00
kumavis 1be8053cca blacklist - update phishing on boot and speed up polling to 4 min 2017-08-04 13:51:48 -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 cddff73703 bring your own BN 2017-08-04 14:42:13 -04:00
kumavis 5a9257208c Merge branch 'master' into NewUI 2017-08-03 21:02:01 -07:00
kumavis 55f0187df7 deps - update 2017-08-03 16:38:44 -07:00
kumavis 026f8592d8 deps - bump eth-detect-phishing 2017-08-03 15:59:01 -07:00
kumavis bb8a09375d Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-03 15:12:24 -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 d4877cb4e2 blacklist - use module eth-phishing-detect 2017-08-03 14:25:02 -07:00
Kevin Serrano 81982d01c0
Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI 2017-08-03 13:10:46 -07:00
kumavis 8a9d0073b1 Merge pull request #1848 from MetaMask/transactionControllerRefractor
Transaction controller refractor part 1: promises for everyone and more tests!
2017-08-02 19:57:16 -07:00
sdtsui 8a39ef03c2 Hook up css animation 2017-08-02 17:49:04 -07:00
kumavis ecaa235b5e phishing detection - move phishing detection into contentscript and metamask controller 2017-08-02 14:26:10 -07:00
sdtsui 96d3b2f35f Add dependejncy: react-burger-menu 2017-08-02 13:03:30 -07:00
frankiebee 25cffd21f8 Merge branch 'master' into transactionControllerRefractor 2017-08-02 11:41:29 -04:00
frankiebee 432f516ab0 make addUnapprovedTransaction async function and use promise based ethQuery 2017-08-02 10:26:25 -04:00
Dan Finlay f8cadbcb32 Merge branch 'master' into NewUI 2017-07-27 15:10:02 -07:00
Dan Finlay 33432afb0c Bump menu-droppo to 2.0.1 2017-07-27 09:14:52 -07:00
Kevin Serrano 66f6d5a4e0
Add levenshtein logic to blacklister. 2017-07-26 15:25:30 -07:00
sdtsui 4573753233 Bump version of menu-droppo, no longer needs css transitions 2017-07-26 12:29:56 -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
kumavis a8525d4b17 Merge pull request #1816 from MetaMask/test-coverage
Test coverage
2017-07-25 17:46:23 -07:00
Thomas Huang eb15663497 One script runs for Ci build 2017-07-25 16:33:52 -07:00
kumavis 77d91ec36f prov-eng - bump to ignore json parse errors 2017-07-25 11:57:03 -07:00
Thomas Huang a1fab06490 Simplify the test-coverage script 2017-07-24 13:46:02 -07:00
Thomas Huang 24ffb40ec7 Add coveralls to script 2017-07-24 09:06:40 -07:00
Thomas Huang d571f5ee70 Add Test Coverage with nyc package and coveralls for github badge 2017-07-23 21:32:49 -07:00
Dan Finlay a41e5788cf Merge branch 'master' into NewUI 2017-07-20 12:39:06 -07:00
Dan Finlay dcf025782b Version 3.9.1 2017-07-19 12:24:32 -07:00
greenkeeper[bot] 82aa0d48d4 chore(package): update dependencies 2017-07-18 22:41:30 +00:00
kumavis aa48ed34c4 nonce-tracker - fix lock mechanism to be a real mutex 2017-07-18 15:11:29 -07:00
sdtsui ccf3e0e251 Bump version of menu-droppo to include bugfix 2017-07-18 05:31:52 -07:00
tmashuang 6cf2a956c1 Update Sinon 2017-07-14 13:05:56 -07:00
Frankie 9d3207fb73 Merge pull request #1617 from MetaMask/nonce-tracker
transaction controller - use nonce-tracker
2017-07-13 15:48:50 -04:00
frankiebee d6001daab8 remove denodeify 2017-07-13 15:24:19 -04:00
sdtsui 1507da139d Add tests for new dropdown component 2017-07-13 00:40:22 -07:00
Dan Finlay 1375807499 Merge branch 'master' into UpdateMetadata 2017-07-12 15:42:23 -07:00
Dan Finlay ebe7666426 Update eth-contract-metadata on build 2017-07-12 15:39:54 -07:00
Dan Finlay 76a2a59ec5 Refresh blacklist before dist 2017-07-12 15:24:59 -07:00
Dan Finlay aec813eace Correct github link 2017-07-12 15:15:19 -07:00
frankiebee 751103d948 Merge branch 'master' into nonce-tracker 2017-07-12 15:10:58 -07:00
Dan Finlay 0079126b7d Point blacklist at main repository 2017-07-12 14:33:03 -07:00
Dan Finlay 52b92fbe40 Add first version of phishing site warning
Links to my own blacklist for now, since I added a package.json for easy importing.

We can point at the main 408H repository once this is merged:
https://github.com/409H/EtherAddressLookup/pull/24

Redirects detected phishing sites [here](https://metamask.io/phishing.html).
2017-07-12 13:09:20 -07:00
kumavis 1448090ec7 deps - bump prov-eng 2017-07-11 15:33:12 -07:00
kumavis 0cc60fda8f deps - bump prov-eng for fetch retry 2017-07-11 14:18:09 -07:00
kumavis 6587f6eabd deps - bump prov-eng for retry on gateway timeout 2017-07-11 12:43:15 -07:00
kumavis d228f46254 Merge branch 'master' into nonce-tracker 2017-07-07 14:21:43 -07:00
kumavis 68fc3603df metamask - append dapp origin domain to rpc request 2017-07-04 12:48:00 -07:00
Dan Finlay 8179f5f84c Bump token-tracker to 1.1.2
To restore older firefox compatibility.
Fixes #1696
2017-06-30 10:11:24 -07:00
Dan Finlay c7f2fd279d Bump token-tracker to 1.1.1
Includes a critical decimal-handling fix.
Also reduces number of symbol and precision queries after initial load.
2017-06-30 09:47:25 -07:00
kumavis 63acc0f4c8 deps - remove duplicated dev-dependencies
```
npm WARN The package clone is included as both a dev and production dependency.
npm WARN The package react-dom is included as both a dev and production dependency.
```
2017-06-29 18:50:21 -07:00
Dan Finlay f285fd5eb1 Bump web3 version to 0.9.1 2017-06-29 14:56:24 -07:00
frankiebee 847a4282a2 Merge branch 'master' into nonce-tracker 2017-06-27 13:10:56 -07:00
Kevin Serrano f21d425839
Simplify build variables. Remove maps from production. 2017-06-26 11:37:12 -07:00
frankiebee fa8c74fe9b add a test for #getNonceLock 2017-06-21 17:28:19 -07:00
Dan Finlay 0799e5edf5 Fix token balance rendering 2017-06-19 19:02:38 -07:00
Dan Finlay 3ccc2b3d2a Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList 2017-06-19 15:24:52 -07:00
Dan Finlay 1c05c82867 Add MetaMark support 2017-06-19 15:22:58 -07:00
Kevin Serrano 9da243f42d
Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList 2017-06-19 13:51:38 -07:00
Frankie ac728189e1 Merge branch 'master' into i1567-FixInaccurateError 2017-06-16 16:46:13 -07:00
frankiebee 3e4f2cf3d3 bump provider engine 2017-06-16 16:34:38 -07:00
frankiebee f76a555c09 Merge branch 'master' into i1567-FixInaccurateError 2017-06-15 14:28:10 -07:00
frankiebee da33efe775 bump eth-query for quiter logs 2017-06-14 21:44:32 -07:00
frankiebee 6ae97290f0 check for the tx in the block that provider engine gives us 2017-06-14 17:43:04 -07:00
frankiebee 56490c6468 Bump provider-engine 2017-06-14 16:14:15 -07:00
Dan Finlay 0b18a69679 Bump token-tracker version 2017-06-14 15:52:46 -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
Dan Finlay de500250c4 Fix build for eth-contract-metadata 2017-06-13 17:46:47 -07:00
Dan Finlay a741cc4fc4 Merge branch 'master' into AddTokenList 2017-06-12 17:17:16 -07:00
kumavis 9fd9c34574 deps - prov-eng 12.2.4 2017-06-12 14:09:38 -07:00
kumavis 2d5a672971 Merge pull request #1572 from MetaMask/mascaraUpkeep
Mascara upkeep
2017-06-12 10:36:48 -07:00
frankiebee 4941b5ab11 bump cswready event 2017-06-08 17:33:27 -07:00
kumavis 57a7fc4425 deps - bump provider engine for warp feature 2017-06-08 16:07:05 -07:00
Dan Finlay f06ad954b9 Move to eth-contract-metadata 2017-05-26 09:58:33 -07:00
Dan Finlay d8c94fca75 Add address image map to icon factory
Deriving from the new address image map repository I've added here:
https://github.com/MetaMask/ethereum-contract-icons

With this PR, images for addresses added to that repository will be shown instead of jazzicons in MetaMask.
2017-05-26 00:43:14 -07:00
Dan Finlay be5af7cb4b Throw if ENS Resolver isn't set up
Instead of resolving to name owners, which can encourage inconsistent usage of ENS.

Fixes #1427.
2017-05-22 17:45:29 -07:00
kumavis 99f28527a3 Merge branch 'master' into HelpDebugStalledTxs 2017-05-22 16:21:24 -07:00
kumavis 1c1400b584 deps - use stream-subprovider from provider-engine 2017-05-22 15:59:07 -07:00