Commit Graph

2613 Commits

Author SHA1 Message Date
Thomas 1605c8544a v4.9.1 2018-08-09 10:23:16 -07:00
Thomas 500ef5cb3a Merge branch 'master' into develop 2018-08-09 10:09:53 -07:00
Eduardo Antuña Díez a2082bae5c Avoid overwriting a domain that can be resolved by DNS
According to the current implementation any domain ending in .eth or .test will try to resolve through ENS even if the DNS is able to resolve it.
changing `onBeforeRequest` to `onErrorOccurred` will only resolve those .eth or .test domains that the DNS is not able to resolve.
2018-08-09 12:20:51 +02:00
Eduardo Antuña Díez 543207b5af Fixed ENS to IPFS functionality in Firefox
`tabs.getSelected` is deprecated and it doesn't work in firefox replaced by `tabs.query({active: true}`
2018-08-09 12:14:09 +02:00
brunobar79 c6b7e460b5 code review changes 2018-08-08 03:00:39 -04:00
brunobar79 2e0916d8ff fix merge conflicts 2018-08-08 02:32:35 -04:00
Esteban MIno 33357e3538 refactor unused code 2018-08-07 19:12:16 -04:00
Esteban MIno 15ea8c04b2 fix merge 2018-08-07 17:53:36 -04:00
Esteban Miño 3f57d5f66b
Merge branch 'develop' into WatchTokenFeature 2018-08-07 17:50:58 -04:00
Esteban MIno c0cdda8321 Merge branch 'develop' into TokensPerAccountBasis 2018-08-07 14:17:40 -04:00
frankiebee cbade51ebd Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into network-remove-provider-engine-tests 2018-08-07 01:53:13 -07:00
frankiebee 115d3c9aaf Merge branch 'network-remove-provider-engine' into network-remove-provider-engine-tests 2018-08-07 01:38:32 -07:00
frankiebee c2d4b237eb network - fix blockTracker reference to return the blockTrackerProxy instead of the direct blockTracker reference 2018-08-07 01:35:30 -07:00
Whymarrh Whitby d0611741a2 Show invalid seed phrase error when importing new account 2018-08-07 02:09:26 -02:30
Esteban MIno af35b415ab new confirm add suggested token component 2018-08-06 20:03:49 -04:00
Esteban MIno 78ad3c38e2 add suggested token params validation 2018-08-06 18:28:47 -04:00
Esteban MIno 9ac9f53a73 eth_watchToken working 2018-08-03 19:24:12 -04:00
brunobar79 71ef4d85da design complete 2018-08-03 18:57:23 -04:00
Esteban MIno 081884bd80 rpc-engine not crashing when eth_watchToken 2018-08-03 16:42:13 -04:00
Esteban MIno 21a61f2987 merge develop 2018-08-03 14:56:02 -04:00
Thomas Huang 024ebe07e0 Merge branch 'develop' into network-remove-provider-engine-tests 2018-08-01 10:40:31 -07:00
brunobar79 710b4e294f added crossbrowser support and error handling 2018-07-31 18:30:56 -04:00
Esteban MIno d8817b2646 fix doc tag 2018-07-31 16:18:06 -04:00
Esteban MIno 3124e8c612 tokens related functions refactor 2018-07-31 15:59:19 -04:00
Esteban MIno ccae79d392 fix undefined for tokens on tests 2018-07-31 13:07:28 -04:00
brunobar79 edb154749d send to fullscreen if no permission from popup 2018-07-30 22:57:05 -04:00
Esteban MIno 22cf5a1391 improve comments 2018-07-30 20:44:22 -04:00
Esteban MIno 822c1734d6 fix double state update when account changed 2018-07-30 20:36:31 -04:00
Esteban MIno fbcba8f019 create tokens storage when setadresses 2018-07-30 19:09:17 -04:00
Esteban MIno 31286673c3 isolation of tokens related methods in preferences 2018-07-30 18:43:34 -04:00
brunobar79 34617a21c3 copy 2018-07-30 18:36:37 -04:00
brunobar79 4339f04e80 use existing modals 2018-07-30 17:50:05 -04:00
Esteban MIno 0757f47e84 passing tokens to all accounts in migration 2018-07-30 11:41:31 -04:00
Thomas d1734b8d7c Update Phishing Html 2018-07-27 14:10:18 -07:00
Esteban MIno e687bc5a47 fix migration for preferences controller tokens 2018-07-27 16:17:28 -04:00
Dan Finlay 9dc5d0cee0
Merge pull request #4905 from MetaMask/eip-712-deprecation
EIP-712: deprecation message
2018-07-27 13:16:44 -07:00
Esteban Miño 228f48c6e5
Merge branch 'develop' into TokensPerAccountBasis 2018-07-27 16:07:08 -04:00
Esteban MIno 5b9725d1f1 refactor to accountTokens 2018-07-27 16:05:12 -04:00
Thomas Huang 1540b5e256
Merge pull request #4893 from kelvintyb/develop
Move phishing warning to the extension
2018-07-27 12:23:31 -07:00
bitpshr 642ae25073 Add deprecation message for eth_signTypedData 2018-07-27 15:23:05 -04:00
Esteban MIno f5107fa12e migration for preferences controller tokens 2018-07-27 14:56:03 -04:00
Esteban MIno 2827e13caa add & delete tokens per network 2018-07-26 19:28:12 -04:00
kumavis e715d0e691
Merge pull request #4858 from MetaMask/chinesesimplifiedandtraditional
Update Chinese naming on our language list
2018-07-26 15:13:24 -07:00
Esteban MIno 1d3ad7cfbb tokens per network for individual account 2018-07-26 18:04:34 -04:00
kumavis ffefeb65d4
Merge pull request #4802 from 03-26/develop
Update translation 🇯🇵
2018-07-26 14:59:12 -07:00
Kelvin Tan 7ca402147d add phishing html page, and redirect to bundled page in-window 2018-07-27 00:03:39 +08:00
Thomas 138858647e Merge branch 'develop' into network-remove-provider-engine 2018-07-25 22:38:44 -07:00
Frankie b5e3aafe2e
Merge pull request #4871 from MetaMask/3519-new-contract-gas
tx-gas-utils -  catch all errors from gas estimation
2018-07-25 15:33:17 -10:00
Esteban MIno adee549c43 preferences test fixes for tokens per account 2018-07-25 17:46:31 -04:00
frankiebee 527b62ee8e migrations - fix to include 27 2018-07-25 14:11:07 -07:00
Esteban MIno 2770df80e3 add & delete tokens per account 2018-07-25 16:14:10 -04:00
William Morriss 5782926c28
Merge pull request #4825 from MetaMask/no-inject-ani-gamer
Do not inject on ani.gamer.com.tw
2018-07-24 19:48:10 -07:00
pinkiebell 3667f3cb85 network.js: convert rpc protocol to lower case (#4855)
Fixes #4253
2018-07-24 19:33:36 -02:30
Jenny Pollack 00bae74475 tx-gas-utils - catch all errors from gas estimation 2018-07-24 14:16:37 -07:00
Kevin Serrano 1d241bef76
Merge branch 'develop' into no-inject-ani-gamer 2018-07-24 12:27:18 -07:00
Dan Miller a61227f224 Remove unneeded code from i4829-close-notifications-from-ui branch. 2018-07-24 15:01:03 -02:30
Dan Miller 64a82fd3da Uncomment closePopupIfOpen code. 2018-07-24 11:45:36 -02:30
Dan Miller 2359062b62 UI confirm screen closes confirmation window on submit or cancel of a tx 2018-07-23 22:20:06 -02:30
Kevin Serrano 519ca1c74b
Update Chinese naming
I sincerely hope this is a non-controversial change.
2018-07-23 09:38:02 -07:00
brunobar79 5ebefc0e50 run linter 2018-07-21 16:03:31 -04:00
Akihiro 3e6d13d309 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-21 11:29:48 +09:00
Akihiro 8c77e998e0 Merge remote-tracking branch 'upstream/develop' into develop 2018-07-21 10:47:14 +09:00
Esteban MIno 9be22775c3 fix merge 2018-07-20 20:15:33 -04:00
Esteban Miño 110efa9ec1
Merge branch 'develop' into detectTokenFeature 2018-07-20 20:09:37 -04:00
Esteban MIno 9c95554933 fix detection on submit password 2018-07-20 19:58:03 -04:00
Csaba S c11dea9afc
Merge branch 'develop' into transaction-notifications 2018-07-20 20:09:57 +02:00
Csaba Solya 72591d4f41 remove dropped handler 2018-07-20 19:58:26 +02:00
Esteban Miño cb045fd8fe
Auto-detect tokens #3034 (#4683)
* detect tokens polling

* network store to detect token

* tests for spec

* passtest-lint

* fix lint

* improve tests

* detect tokens through infura

* detect tokens when submit password and new account selected

* keyring unlocked detect and unit tests

* add changelog
2018-07-20 12:36:24 -04:00
Csaba Solya a3822b4680 add notifications 2018-07-20 13:20:40 +02:00
Esteban MIno 009b1cefbe keyring unlocked detect and unit tests 2018-07-19 19:46:46 -04:00
Csaba Solya 6921f94bfe initial test 2018-07-19 22:34:06 +02:00
Esteban MIno 3b97d816ff detect tokens when submit password and new account selected 2018-07-19 15:56:38 -04:00
Bruno Barbieri 9be2248d7a
Merge pull request #4625 from MetaMask/initial-trezor-support
Initial trezor support
2018-07-19 15:00:59 -04:00
Dan Finlay 3784a7e2c8
Merge pull request #4656 from MetaMask/portal-metamask-ens-test
Add support for .test ENS domains
2018-07-19 09:41:28 -07:00
Jenny Pollack ae811628d9
Merge pull request #4833 from MetaMask/brave-flag-sentry
sentry - add detection for Brave Browser
2018-07-19 11:58:59 -04:00
Jenny Pollack 16fc7efef1 remove local tests 2018-07-19 09:59:58 -04:00
bitpshr d24b5b76fd Update variable name 2018-07-19 08:04:17 -04:00
bitpshr d02c160db5 Updates for linting 2018-07-19 08:04:17 -04:00
bitpshr 94f99b6ed0 Updates 2018-07-19 08:04:17 -04:00
bitpshr 8df433ca84 Add support for .test Ropsten ENS domains 2018-07-19 08:04:17 -04:00
brunobar79 df19163bf9 last css fixes 2018-07-19 02:31:13 -04:00
Jenny Pollack 1a9748667d sentry - add detection for Brave Browser 2018-07-19 02:22:56 -04:00
brunobar79 49d1bdea8a design done 2018-07-18 22:57:47 -04:00
Dan Finlay 6d04c80302
Merge pull request #4813 from MetaMask/no-inject-blueskybooking
Do not inject on blueskybooking.com
2018-07-18 17:27:25 -07:00
Dan Finlay dd9e3587d4
Do not inject on ani.gamer.com.tw
Fixes #4799
2018-07-18 15:23:32 -07:00
brunobar79 cbb14f1d5e fix browser not supported screen 2018-07-17 21:57:19 -04:00
brunobar79 aa5a987765 added some e2e tests 2018-07-17 21:54:04 -04:00
brunobar79 cb53d5122c Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-17 20:43:32 -04:00
brunobar79 cb97517b26 updated account list based on new designs 2018-07-17 18:53:37 -04:00
Alexander Tseung 301ae305b8 Use Number constructor for number conversion. Use existing noConversionRateAvailable message 2018-07-17 14:06:30 -07:00
Alexander Tseung d19c42fcae Add fallback when no function found, fix network colors, add fiat values for tokens with contract exchange rates 2018-07-17 13:38:14 -07:00
brunobar79 e89350b19f added tests for removeAccount 2018-07-17 01:44:28 -04:00
brunobar79 de4265c629 added more unit tests 2018-07-17 01:17:18 -04:00
brunobar79 e5512c306d added unit tests for metamaskcontroller 2018-07-16 19:36:08 -04:00
Dan Finlay 6be6b9ef29
Do not inject on blueskybooking.com
Per zendesk 2312.
2018-07-16 15:39:35 -07:00
Sara Reynolds 684fc710ee Fix edge cases and add translation compatibility 2018-07-16 13:03:24 -07:00
03-26 9dd637569d Update 2018-07-15 15:09:18 +09:00
brunobar79 d21d408d64 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-13 20:53:22 -04:00
brunobar79 3ae5b4e772 update label 2018-07-13 19:47:45 -04:00
brunobar79 5399546388 added affiliate link to trezor 2018-07-13 13:49:20 -04:00
Esteban MIno 2fffe09873 detect tokens through infura 2018-07-12 20:43:43 -04:00
Dan Finlay c4ae399577
Add harbourair.com to injection block list
This site was getting unexpected results when MetaMask was installed.

https://consensys.zendesk.com/agent/tickets/2312
2018-07-12 14:21:32 -07:00
Thomas Huang 5a45df72c6
Merge pull request #4669 from MetaMask/removeNonceTrackerFunction
Remove unsued nonce tracker function
2018-07-12 11:48:05 -07:00
brunobar79 07d8bfaec5 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-12 12:54:08 -04:00
Whymarrh Whitby d9f98a704e Add tooltip to new tab icon in tx-view 2018-07-12 12:32:45 -02:30
Whymarrh Whitby 7581a4906f Add tooltip to menu icon in tx-view 2018-07-12 12:32:45 -02:30
brunobar79 2a0a785324 added tooltip 2018-07-12 00:23:08 -04:00
Alexander Tseung 0d4dbbec2a
Merge pull request #4691 from MetaMask/i4404-confirm-refactor
Refactor and redesign confirm transaction views
2018-07-11 15:31:50 -10:00
brunobar79 80e875308b forget device and autiload account features added 2018-07-11 21:21:36 -04:00
brunobar79 89cc48789a update to temp dependencies 2018-07-11 20:01:44 -04:00
Esteban MIno 910713c6b3 improve tests 2018-07-11 15:59:05 -04:00
brunobar79 523cf9ad33 account removal is working 2018-07-11 00:20:40 -04:00
brunobar79 b9c2994d24 finish warning modal UI 2018-07-10 19:19:29 -04:00
Thomas 5188b727d4 Merge branch 'develop' into removeNonceTrackerFunction 2018-07-10 11:34:00 -07:00
frankiebee 28c509914b Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into i#3896 2018-07-10 11:32:05 -07:00
brunobar79 9b81180ab1 added ui to remove accounts 2018-07-10 00:20:00 -04:00
brunobar79 85a4e39b05 fix trezor label 2018-07-09 20:54:47 -04:00
brunobar79 d3f793a44a added label for trezor accounts 2018-07-09 19:04:30 -04:00
brunobar79 2de3039b6b fix account duplication 2018-07-09 17:55:37 -04:00
brunobar79 7cca7ace2e fix all the account related bugs 2018-07-09 17:24:52 -04:00
brunobar79 5127601545 copy updated 2018-07-06 20:37:08 -04:00
brunobar79 dddbb4250b update connect harwdware screen 2018-07-06 20:04:20 -04:00
Alexander Tseung a2d9c43fba Various fixes from PR comments 2018-07-06 16:27:08 -07:00
Alexander Tseung 9cde5ab11b Use eth-method-registry to get method data 2018-07-06 16:27:08 -07:00
Alexander Tseung 7732cd4100 Display newest transaction 2018-07-06 16:27:08 -07:00
Alexander Tseung ea9d51e427 Refactor and redesign confirm transaction views 2018-07-06 16:27:08 -07:00
brunobar79 7c9d942ba1 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-06 19:21:18 -04:00
brunobar79 6b2511f94f UI refactor 2018-07-05 20:59:31 -04:00
brunobar79 ba5cde0995 move strings to localization file 2018-07-05 17:04:36 -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 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 f262f0ea64 Update import from seed screen on new ui. 2018-07-04 21:21:12 -02:30
brunobar79 9d3f2435e5 lint fix 2018-07-03 15:46:15 -04:00
kumavis 77daed5c74 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-07-03 12:42:14 -07:00
brunobar79 3837c2ddd7 fix merge conflicts 2018-07-03 15:41:18 -04:00
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
bitpshr badf0ce314 Conditionally use Promise-based extension API when creating windows 2018-07-03 13:33:13 -04:00
brunobar79 3290421e2f fix merge conflicts 2018-07-03 13:31:30 -04:00
Esteban MIno 0494b2fc8a Merge branch 'develop' into detectTokenFeature 2018-07-03 13:23:15 -04:00
Esteban MIno 03fd4355af passtest-lint 2018-07-03 12:53:06 -04:00
brunobar79 a8f745f9fe eslint --fix . 2018-07-02 18:49:33 -04:00
kumavis a89902c170 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-07-02 13:54:05 -07:00
brunobar79 f19ffaf08d move hardcoded strings to localization file 2018-07-02 15:16:05 -04:00
brunobar79 317c3084df allow to open specific route in fullscreen mode 2018-07-02 15:14:31 -04:00
brunobar79 451c05bcbb fix environment detection regex 2018-07-02 15:14:05 -04:00
brunobar79 1494cc5e6c fix merge conflicts 2018-07-01 11:41:34 -10:00
PhyrexTsai 11736e6318
Update to support pathnames on IPFS hash
As @Georgi87 mentioned about pathnames on the domain like `http://phyrextsai.eth/home` will pass to IPFS hash and append `/home` on redirection url.

You can try the example below: 
http://phyrextsai.eth/index.html
http://phyrextsai.eth/images/phyrex.jpg
2018-06-29 13:57:41 +08:00
Dan de01a6f112 Use background gas price estimation method in new ui. 2018-06-28 21:28:59 -02:30
Esteban MIno 6284e66481 tests for spec 2018-06-27 22:18:06 -04:00