m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-26 12:29:06 +01:00
Code
8,497 Commits 2 Branches 0 Tags 265 MiB
7fb9f91d27
Commit Graph

2838 Commits

Author SHA1 Message Date
Alexander Tseung
95e1eff4ca Add TransactionDetails modal 2018-09-19 14:31:10 -07:00
Alexander Tseung
5a6c333506 Switch existing modals from using Notification to Modal. Remove Notification component. Add CancelTransaction modal 2018-09-19 14:31:10 -07:00
tmashuang
f0f798f7e1 Version 4.10.0 2018-09-17 14:42:04 -05:00
Paul Bouchon
daca7f9b41
Merge branch 'develop' into eip-712 2018-09-17 12:11:10 -04:00
Farah Brunache
b2a93ba278 fixed some grammatical errors 2018-09-16 12:36:44 -04:00
Farah Brunache
906628e54b added Haitian Creole translations 2018-09-15 18:12:22 -04:00
Paul Bouchon
2ec09362c5
EIP-1102: Transitionary API (#5256) 2018-09-14 19:26:03 -04:00
bitpshr
42fdcf6239 Update new method namespace from v2 to v3 2018-09-13 15:42:27 -04:00
bitpshr
68c2554296 Update error message for chainId mis-match 2018-09-13 15:40:57 -04:00
bitpshr
36dd0354e7 Implement latest EIP-712 protocol 2018-09-13 15:40:57 -04:00
Alexander Tseung
f1a309e0cc Fix identicon address. Fix styling of New Contract recipient. Fix Activity Log initial ETH value. Add timestamps to Activity Log events 2018-09-12 19:48:52 -07:00
Alexander Tseung
5beb34aa52 Add TransactionListItemDetails component 2018-09-12 19:48:52 -07:00
Alexander Tseung
084158f1a2 Add tests for TransactionActivityLog. Make changes to rendering events 2018-09-12 19:48:52 -07:00
Alexander Tseung
930dac110a Add ActivityLog component 2018-09-12 19:48:51 -07:00
Dan Finlay
ce1975fbb4
Merge pull request #5240 from MetaMask/i5238-account-balance-update 
Ensure account-tracker currentBlockNumber is set on first block update.
 2018-09-11 14:31:10 -07:00
Whymarrh Whitby
13bc46d824 Default NoticeController ctor opts to empty obj 2018-09-11 12:12:35 -07:00
Whymarrh Whitby
d60991ec88 Delete ConfigManager, replacing its usages with PreferencesController 2018-09-11 09:39:16 -07:00
Dan Miller
eb32ccb0c7 Ensure account-tracker currentBlockNumber is set on first block update. 2018-09-11 12:51:49 -02:30
Frankie
1552fe1c3e
Merge pull request #5216 from MetaMask/tx-cancel 
Add createCancelTransaction method
 2018-09-10 13:29:29 -10:00
Frankie
a43e71693f
Merge pull request #5223 from whymarrh/tx-error-tooltips 
Show transaction error message tooltips for statuses
 2018-09-10 13:25:59 -10:00
Alexander Tseung
43de189d06 Add createCancelTransaction method 2018-09-10 12:48:01 -07:00
Connor Christie
ee568d5f5a Upgrade obs-store and fix memory leaks 2018-09-09 19:33:51 -05:00
Whymarrh Whitby
7c3b69e1e4 Attach the RPC error value to txMeta 2018-09-08 19:59:50 -02:30
brunobar79
8ee01f4e99 Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-09-05 16:26:09 -04:00
Dan J Miller
b9e4feac48
Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-data 
Adds feature flag toggle for the hex data row on the send screen.
 2018-09-04 11:57:40 -02:30
Dan J Miller
03d789a490
Merge pull request #5115 from jdetychey/patch-1 
Typo in "send" translation
 2018-09-04 11:41:35 -02:30
Esteban MIno
e743f44150 fix conflicts 2018-08-28 15:20:30 -03:00
Esteban MIno
3106374cc3 watchAsset small changes 2018-08-27 22:10:14 -03:00
Dan Finlay
4b17ec67ec
Merge pull request #4919 from MetaMask/refactor-tx-list 
Refactor and Redesign Transaction List
 2018-08-27 15:02:07 -07:00
Dan Miller
65873e33e4 Adds feature flag toggle for the hex data row on the send screen. 2018-08-27 11:44:16 -02:30
bitpshr
803a79f836 Do not resolve .test domains using ENS 2018-08-24 12:40:37 -04:00
Alexander Tseung
342522c6cf Fix naming, add eth.getCode check for actions, fix translations for statuses 2018-08-23 16:45:28 -07:00
Alexander Tseung
eb17151ff4 Change "Outgoing" to "Sent Ether" or "Sent Token" 2018-08-23 16:45:28 -07:00
Alexander Tseung
9adf0c4b60 Fix integration tests 2018-08-23 16:45:27 -07:00
Alexander Tseung
5de48c67a0 Use css grid for TransactionListItem for responsive layout 2018-08-23 16:44:44 -07:00
Alexander Tseung
5ee40675b9 Refactor transactions list views. Add redesign components 2018-08-23 16:44:44 -07:00
Esteban MIno
053e262ae7 delete web3.metamassk.watchAsset 2018-08-23 16:32:04 -03:00
Esteban MIno
b59a1e91b8 typo watchAsset imageUrl to image 2018-08-23 15:54:40 -03:00
HackyMiner
dae07b32e5 update Korean translation (#4630) 
* update Korean translation

* update Korean translation, add updated missing strings

* update Korean i18n messages
 2018-08-23 14:39:45 -02:30
Evgeniy Filatov
9a80d6e859 updated docs, small improvement of recent RPC rendering 2018-08-23 01:26:30 +03:00
Evgeniy Filatov
b23cca1469 implemented improvements to RPC history 2018-08-23 01:18:13 +03:00
Esteban MIno
56bed3f1bc expose web3.metamask.watchAsset 2018-08-22 18:14:10 -03:00
Dan Finlay
f30b726df7
Merge pull request #5122 from MetaMask/lazy-account-tracker 
Network IO Optimization: Lazy AccountTracker
 2018-08-22 13:31:42 -07:00
Dan Finlay
bf6d624e76 Add todo to dedupe UI tracking in background 2018-08-22 12:05:41 -07:00
Whymarrh Whitby
171f6711d9
Merge pull request #5066 from whymarrh/fix-key-export 
Don't re-render the export modal when the selected identity changes
 2018-08-22 16:28:17 -02:30
kumavis
cb0af67f74 metamask controller - force account tracker to update balances on network change 2018-08-22 11:23:54 -07:00
Whymarrh Whitby
003d445a98 Update unlock logic to not overwrite existing selected address 2018-08-22 15:38:34 -02:30
brunobar79
b208ce7234 add port names blacklist 2018-08-22 14:04:26 -04:00
Alexander Tseung
7294aede4f Add new variant for SenderToRecipient component 2018-08-22 10:53:20 -07:00
brunobar79
fdff768549 handle onDisconnect 2018-08-22 13:39:43 -04:00
brunobar79
055e0f8dac fix merge conflicts 2018-08-22 13:37:47 -04:00
kumavis
a2654108be account-tracker - only track blocks when there are activeControllerConnections 2018-08-21 16:49:24 -07:00
kumavis
3ac2b40dcf metamask controller - track active controller connections 2018-08-21 16:30:11 -07:00
Esteban MIno
4e6c71e969 Merge branch 'develop' into WatchTokenFeature 2018-08-21 20:14:49 -03:00
Dan Finlay
babd59a2dc
Merge pull request #5109 from MetaMask/MoveOutInpageProvider 
Move inpage-provider and port-stream outside
 2018-08-21 14:38:47 -07:00
Dan Finlay
a485516488
Merge pull request #5118 from MetaMask/provider2-bugfix 
bugfix - prevents old blocktracker from getting internal hooks migrated
 2018-08-21 14:27:34 -07:00
kumavis
13dfea7f2d bugfix - prevents old blocktracker from getting internal hooks migrated 2018-08-21 14:13:23 -07:00
brunobar79
90886c5e05 Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-08-21 15:58:29 -04:00
Jerome de Tychey
92af1ee95a
Typo in "send" translation 
send should be translated as Envoyer instead of Envoyé (which mean sent, not send)
 2018-08-21 18:56:24 +02:00
Esteban MIno
3a3732eb24 returning error in watchAsset 2018-08-21 13:12:45 -03:00
Esteban MIno
6fa889abcb refactor watchToken related functions 2018-08-21 12:59:42 -03:00
brunobar79
cee5783283 fix hardware wallets account name 2018-08-21 00:04:30 -04:00
brunobar79
34e3ec6092 fix account removal 2018-08-21 00:04:07 -04:00
brunobar79
ab7eb73ecc fix merge conflicts 2018-08-20 21:51:35 -04:00
Esteban MIno
68c1b4c170 watchAsset returns result wether token was added or not 2018-08-20 22:32:14 -03:00
Dan Finlay
6ce119d1fb Move inpage-provider and port-stream outside 
With the creation of the [metamask-extension-provider](https://github.com/MetaMask/metamask-extension-provider) we have our first non-core module that is dependent on the inpage-provider and port-stream.

To reduce the size of its dependencies, I have moved the
[metamask-inpage-provider](https://github.com/MetaMask/metamask-inpage-provider) into its own module, as well as [extension-port-stream](https://github.com/MetaMask/extension-port-stream).

This allows them to be more easily depended & iterated on by external
projects.
 2018-08-20 15:45:50 -07:00
Esteban MIno
81cd29df43 Merge branch 'develop' into WatchTokenFeature 2018-08-20 19:35:38 -03:00
Dan Finlay
097c1e90e3
Merge pull request #5084 from MetaMask/ledger-support-without-provider 
Ledger support (in case of rollback)
 2018-08-20 10:23:15 -07:00
Alexander Tseung
cec87a5b2c Update logo wordmark 2018-08-18 20:46:56 -07:00
Bruno Barbieri
bd904c86f6
Merge branch 'develop' into ledger-support 2018-08-17 13:45:46 -04:00
brunobar79
992e7f1b5a fix merge conflicts 2018-08-17 12:56:07 -04:00
Dan Matthews
df799d7fd6 Restores accounts until one with a zero balance is found 2018-08-17 10:26:47 -04:00
brunobar79
285814646f ui ready 2018-08-16 20:41:23 -04:00
Esteban MIno
dbab9a007f delete according image when token added with watchToken deleted 2018-08-16 21:17:02 -03:00
brunobar79
2ea05e303d connect screen ready 2018-08-16 19:39:52 -04:00
Esteban MIno
bb868f5834 correct behavior when notification is closed when popup 2018-08-16 20:19:19 -03:00
Esteban MIno
a36ea0e232 show watch asset image from hide token modal 2018-08-16 12:04:43 -03:00
Esteban MIno
5289a36664 change watchAsset to new spec for type ERC20 2018-08-15 20:01:59 -03:00
Dan Finlay
955ec2dca6
Merge pull request #4279 from MetaMask/network-remove-provider-engine 
Enhancement: New BlockTracker and Json-Rpc-Engine based Provider
 2018-08-15 15:41:05 -07:00
Esteban MIno
b766104c8d add suggested tokens objects in metamask state 2018-08-15 18:34:57 -03:00
Thomas
d636cc3552 v4.9.3 2018-08-15 10:06:20 -07:00
Dan Finlay
7c47187f4d
Merge pull request #5037 from MetaMask/master 
Update develop branch to v4.9.2
 2018-08-15 10:02:20 -07:00
brunobar79
837be704f5 change Metamask for MetaMask 2018-08-15 11:44:00 -04:00
Bruno Barbieri
80fe3ce888
Merge branch 'develop' into ledger-support 2018-08-14 22:55:47 -04:00
brunobar79
82a5ed1e03 remove console logs 2018-08-14 22:40:29 -04:00
brunobar79
fdf202efb0 fixed unit tests 2018-08-14 21:19:01 -04:00
brunobar79
c72ced79ae ui fixes 2018-08-14 19:22:00 -04:00
Esteban MIno
a4b6b2357a watchToken to watchAsset 2018-08-14 20:09:56 -03:00
Esteban MIno
a4c3f6b65c add support for images base64 and urls on new ui 2018-08-14 20:08:12 -03:00
Thomas
96d789d2cf Merge branch 'develop' into network-remove-provider-engine 
Override package-lock and fix merge conflicts
 2018-08-14 10:44:42 -07:00
Esteban MIno
8f5b80a0fe update method to metamask_watchToken 2018-08-14 13:58:47 -03:00
brunobar79
b77cc3d969 fix tx tests 2018-08-14 03:42:23 -04:00
brunobar79
61a279204a legacy and new hd path working 2018-08-14 01:26:18 -04:00
brunobar79
4e1d8ba19d good progress adding paths 2018-08-13 19:29:43 -04:00
Whymarrh Whitby
6e6a4825ac Fix casing of Bitcoin, Ethereum, and Litecoin across localized messages 
Using the following commands:

    sed -i.bak s/bitcoin/Bitcoin/ app/_locales/**/*.json && \
        find app/_locales/ -name '*.bak' -delete

    sed -i.bak s/ethereum/Ethereum/ app/_locales/**/*.json && \
        find app/_locales/ -name '*.bak' -delete

    sed -i.bak s/litecoin/Litecoin/ app/_locales/**/*.json && \
        find app/_locales/ -name '*.bak' -delete
 2018-08-13 19:47:56 -02:30
Whymarrh Whitby
6c11ae44bf Fix casing of MetaMask in all localized messages 
Using the following:

    sed -i.bak s/Metamask/MetaMask/ app/_locales/**/*.json && \
        find app/_locales/ -name '*.bak' -delete
 2018-08-13 19:47:45 -02:30
hahnmichaelf
e19eb7bc03 additional lint-test fix 2018-08-13 13:21:18 -04:00
hahnmichaelf
4808ce25eb fix for lint-test 2018-08-13 13:16:37 -04:00
hahnmichaelf
e454a5e0e8 fixed names 2018-08-13 12:56:35 -04:00
hahnmichaelf
8fb2dfe3d7 Re-added GA script 2018-08-13 12:47:18 -04:00
hahnmichaelf
7d2d71bcbc change name 2018-08-13 12:40:16 -04:00
hahnmichaelf
9666eaba66 base - working. fixes #4774 2018-08-12 18:57:58 -04:00
brunobar79
8f9a0a535c clean up 2018-08-12 01:43:41 -04:00
brunobar79
0b9b892c6b this should be ready to go 2018-08-12 01:34:01 -04:00
brunobar79
2355573340 clean up 2018-08-12 00:06:36 -04:00
brunobar79
e6d64cecf8 message signing works 2018-08-11 20:26:34 -04:00
brunobar79
068bf43615 working 2018-08-11 19:27:24 -04:00
brunobar79
12b41b8fc2 tx signature is valid 2018-08-11 18:20:50 -04:00
brunobar79
011cc141b3 tx signing should work 2018-08-11 16:00:29 -04:00
brunobar79
aa6a42e3de rename keyring 2018-08-11 05:11:21 -04:00
brunobar79
8e842a8947 able to add accounts 2018-08-11 05:02:02 -04:00
brunobar79
78a1cd3314 iframe communication working 2018-08-11 02:35:20 -04:00
brunobar79
5ef80495cf refactor to support multiple hw wallets 2018-08-10 21:54:34 -04:00
Bruno Barbieri
e2be22a4b7
Merge pull request #4897 from MetaMask/qr-code-scan 
QR Code Scanner
 2018-08-10 13:40:06 -04:00
brunobar79
6f2c4809b6 undo permission change 2018-08-10 13:10:21 -04:00
brunobar79
814c642d95 fixes 2018-08-10 11:44:32 -04:00
brunobar79
c8d75f3230 use new connect.js file 2018-08-09 23:19:17 -04:00
brunobar79
35282980cf Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-08-09 18:49:21 -04:00
Thomas
b887730be7 v4.9.2 2018-08-09 14:42:34 -07:00
Dan Finlay
be1d5a7dd9
Merge pull request #5020 from MetaMask/FixMigration28 
Fixes migration 28
 2018-08-09 14:24:38 -07:00
Jenny Pollack
00a2ab21ae sentry - change releaseVersion to release 2018-08-09 13:49:40 -07:00
Esteban MIno
8df3f2696c fix migration 28 2018-08-09 16:15:56 -04:00
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
286bde606f fix merge conflicts 2018-08-08 14:30:49 -04: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
brunobar79
0ebdd73e02 clean up 2018-08-05 03:17:51 -04:00
brunobar79
aaed44f1ec trezor v5 working on firefox 2018-08-05 02:43:02 -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