m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code
8,848 Commits 2 Branches 0 Tags 265 MiB
31175625b4
Commit Graph

1205 Commits

Author SHA1 Message Date
Whymarrh Whitby
1988e1e96b ESLint fixes (#5775) 
* eslint . --fix

* Upgrade all ESLint warnings to errors
 2018-11-16 14:54:55 -10:00
Frankie
ce147bf6d8 Tx controller now uses safe event emitter (#5769) 
* transactions - use safe-event-emitter over events

* tests - pass a platform object on init with a noop showTransactionNotification

* test - fix for tx-state-history-helper trying to reduce an empty array

* deps - safe-event-emitter

* lint
 2018-11-16 10:34:08 -08:00
brunobar79
c0557b43e2 clean up 2018-11-15 00:34:49 -05:00
brunobar79
3219e949cf Merge branch 'trezor-v5' of github.com:MetaMask/metamask-extension into trezor-v5 2018-11-15 00:30:49 -05:00
brunobar79
e44b750f0f Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-11-15 00:29:06 -05:00
brunobar79
938f4286e4 remove error flags from drizzle setup 2018-11-14 17:41:49 -05:00
brunobar79
4dbc0926c6 test 2018-11-14 17:33:10 -05:00
brunobar79
517f6e656a test 2018-11-14 17:10:20 -05:00
brunobar79
59b089b5bb test 2018-11-14 17:01:39 -05:00
brunobar79
b54ed05306 try with custom box 2018-11-14 16:35:01 -05:00
Dan Finlay
22ba0b0c2d Resubmit approved transactions on new block (#5752) 
* Add beginning of test

* Resubmit approved transactions on new block

May fix #4343 and related issues, where an error could leave
transactions stranded in the approved state.

* Remove unused test

* Re-approve transactions when retrying approved

* Add retry approved test

* Include approved in pending tx count

* Fix getPendingTxs()

* Linted

* Only throw hash error in submitted state

* Only check submitted txs for block inclusion

* Fix test expectations
 2018-11-14 11:34:07 -10:00
brunobar79
484aa6801e Merge branch 'develop' into trezor-v5 2018-11-13 17:21:15 -05:00
Paul Bouchon
0549782595
Update Balanc3 API (#5744) 
* Update balanc3 API used in TokenRatesController

* Remove demo URL and use nativeCurrency when fetching token rates
 2018-11-13 14:57:43 -05:00
PaddyMc
7ce2cf4572 Fixes #3425: Better support for batch transactions (#5437) 2018-11-13 13:49:12 -03:30
Thomas Huang
782c2c14d4
Merge pull request #5674 from MetaMask/responsive-e2e-tests 
e2e tests for responsive behaviour
 2018-11-09 11:01:38 -08:00
Dan Miller
fd1647965f Moves e2e tests for extension only behaviour to metamask-beta-responsive-ui.spec 2018-11-08 07:59:32 -03:30
Thomas Huang
0ab5c1c6e2
Merge pull request #5481 from MetaMask/reducers 
tests/Reducers
 2018-11-06 20:56:15 -08:00
brunobar79
c651212025 fix merge conflicts 2018-11-06 20:21:19 -05:00
brunobar79
62ac993b9a fix typo 2018-11-06 19:22:47 -05:00
brunobar79
6daf749251 update drizzle tests 2018-11-06 19:08:23 -05:00
Whymarrh Whitby
26ada8a828 Update Connect Request screen design (#5644) 
* Parameterize NetworkDisplay background colour

* Update design for login request screen

* Pass siteTitle, siteImage through for calls to ethereum.enable()

* Bring the site images closer together
 2018-11-05 15:07:09 -08:00
bitpshr
01ff0bd3c0 Increase timeout in Mascara test 2018-11-05 15:07:09 -08:00
bitpshr
c6e9caed22 Fix beta e2e tests 2018-11-05 15:07:09 -08:00
bitpshr
473afa68a1 Cleanup after rebase 2018-11-05 15:07:09 -08:00
bitpshr
226601a956 EIP-1102: add user privacy option 2018-11-05 15:07:09 -08:00
bitpshr
c76c9ca2c8 EIP-1102: updated implementation 2018-11-05 15:07:09 -08:00
Esteban Miño
4489a57f2f Update watchAsset ERC20 validation (#5653) 
* update ERC20 token valodation for watchAsset

* update ERC20 validation test descriptions
 2018-11-05 15:36:34 -03:30
Thomas
f2fea8043e Remove .only 2018-10-31 07:09:02 -07:00
Thomas
7607794851 Readable tests, and set nextUnreadNotice to null when CLEAR_NOTICES is dispatched 2018-10-31 07:07:25 -07:00
Thomas
7531de14f9 Merge branch 'develop' into reducers 2018-10-31 05:55:25 -07:00
Thomas
611a61b7bc Isolate variables to individual tests 2018-10-31 05:45:27 -07:00
HackyMiner
54a8ade266 Add support for RPC endpoints with custom chain IDs (#5134) 2018-10-26 10:26:43 +02:00
Alexander Tseung
554f79c0e2
Fix blockies icons overriding contract map icons. Refactor Identicon component (#5599) 2018-10-25 17:21:41 +08:00
kumavis
802df4625f
Merge pull request #5570 from alextsg/i5558-account-display-width 
Fix account display width for large currency values
 2018-10-21 10:45:55 -04:00
Alexander Tseung
614995c0e9 Fix account display width for large currency values 2018-10-21 22:01:20 +08:00
brunobar79
baa3af46f3 install truffle globally 2018-10-21 05:35:37 -04:00
brunobar79
9c1b2108f6 fix merge conflicts 2018-10-21 01:59:53 -04:00
kumavis
b0c649a4e3
Merge pull request #5555 from MetaMask/support-wallet-watch-asset 
Support for prefix wallet_watchAsset
 2018-10-21 01:27:08 -04:00
Esteban Miño
7c4f98ffd6 specific add and remove methods for frequentRpcList (#5554) 2018-10-19 17:50:54 -02:30
Esteban MIno
75661673e5 add support for wallet_watchAsset 2018-10-19 13:57:11 -03:00
Whymarrh Whitby
42fa54678f Extract Add Token button into its own component 2018-10-17 15:49:29 -02:30
Whymarrh Whitby
97b914abea Delete add-token integration test 2018-10-17 15:37:40 -02:30
Alexander Tseung
badebe017f
Adds toggle for primary currency (#5421) 
* Add UnitInput component

* Add CurrencyInput component

* Add UserPreferencedCurrencyInput component

* Add UserPreferencedCurrencyDisplay component

* Add updatePreferences action

* Add styles for CurrencyInput, CurrencyDisplay, and UnitInput

* Update SettingsTab page with Primary Currency toggle

* Refactor currency displays and inputs to use UserPreferenced displays and inputs

* Add TokenInput component

* Add UserPreferencedTokenInput component

* Use TokenInput in the send screen

* Fix unit tests

* Fix e2e and integration tests

* Remove send/CurrencyDisplay component

* Replace diamond unicode character with Eth logo. Fix typos
 2018-10-17 07:03:29 +08:00
brunobar79
13820b6cc1 fix conflicts 2018-10-16 14:01:54 -04:00
Whymarrh Whitby
af43b7d6c9 Ensure that new transactions added are using the selected address 2018-10-10 16:16:20 -02:30
Thomas Huang
b45479934d test - add actions unit tests (#5369) 
* Actions.spec.js

* Error handling tests

* Lint
 2018-10-10 10:32:26 -04:00
bakaoh
63c61c52eb Make all addresses EIP-55 compliant (#5379) 
* Make all addresses EIP-55 compliant

* Checksum autocompleted address but not during input
 2018-10-10 10:50:37 -02:30
Thomas
be3f411a60 Reducers 2018-10-10 01:12:46 -07:00
Bruno Barbieri
ccab4ee1a4 tests - integration - Add Drizzle tests (#5467) 
* added drizzle app for testing

* working

* clean up

* clean up script

* make build step required

* add drizzle-tests to .eslintignore

* clean up drizzle run script

* lint

* use truffle unbox

* undo eslintignore changes

* revert change

* dont use global

* dont need this steps

* use the new account flow

* restore package-lock.json
 2018-10-10 01:12:43 -04:00
Santiago Gonzalez Toral
f88373237b Added account options on home screen 2018-10-09 19:43:41 -07:00
Noel Yoo
ebdefe81a1 Refactor buffer constructor (#5468) 2018-10-09 09:32:48 -02:30
Noel Yoo
012f7ddd72 Fix typos (#5471) 2018-10-09 09:29:51 -02:30
Dan Finlay
c8521e49ad
Merge pull request #5428 from alextsg/i5372-queue-order 
Reverse pending transactions order
 2018-10-05 11:07:44 -07:00
Alexander Tseung
0527d02216 Reverse pending transactions order 2018-10-04 21:37:41 -07:00
Dan Finlay
c49d854b55 Increase suggested gas percentile to 65 (#5359) 
* Increase suggested gas percentile to 65

I keep submitting transactions then waiting a long time. Apparently 50th percentile isn't enough.

* Update test for getGasPrice
 2018-10-04 18:38:05 -02:30
Whymarrh Whitby
4dd6c8168f Add ability to whitelist a blacklisted domain at runtime 2018-10-02 10:43:46 -02:30
Whymarrh Whitby
08b3f41ecd Fix error message shown in assertElementNotPresent e2e helper fn 2018-10-01 12:28:24 -02:30
Whymarrh Whitby
b7946928fd Don't log errors extraneously in e2e tests 2018-10-01 12:28:00 -02:30
Whymarrh Whitby
9f2d074f9e Update e2e tests for adding mutliple custom RPC endpoints 
Refs 56965b3
Refs #5267

The list of custom RPC endpoints is no longer limited to 3 entries
so the test is now to confirm that they _all_ show up.
 2018-10-01 12:24:32 -02:30
Whymarrh Whitby
5beab87bf6 Switch string concatenation to template string 2018-10-01 12:23:53 -02:30
Thomas Huang
db30bbce4c
Merge pull request #5332 from MetaMask/ui-unit-tests 
Some Ui tests
 2018-09-25 23:17:17 -05:00
Paul Bouchon
88b5f82e13 Bugfix: Upgrade json-rpc-engine (#5348) 
* Bugfix: bump version of json-rpc-engine

* Increase delay

* Update lockfile

* deps - json-rpc-engine@3.7.4
 2018-09-25 21:16:01 -07:00
Alexander Tseung
5d57c7c4fd
Merge pull request #5282 from MetaMask/tx-cancel-ui 
Add Cancel Transaction feature. Refactor modals. Add Transaction Details modal.
 2018-09-24 11:34:12 -07:00
tmashuang
a0a57c24fd Some Ui tests 2018-09-24 11:28:04 -05:00
Alexander Tseung
b579ee9619 Refactor settings page to use JSX and follow component file folder structure 2018-09-19 16:37:23 -07:00
Alexander Tseung
77e8eac4b3 Fix integration tests 2018-09-19 14:31:10 -07:00
bitpshr
36dd0354e7 Implement latest EIP-712 protocol 2018-09-13 15:40:57 -04:00
Alexander Tseung
c18c0e1c30 Fix tests. Add className to Identicon ethLogos. 2018-09-12 19:48:52 -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
brunobar79
8ee01f4e99 Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-09-05 16:26:09 -04:00
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 Miller
952edf695c Revert changes to tx-list-items.json, and to mock getTransactionCount method in tx-list-items integration test. 2018-08-27 17:07:01 -02:30
Alexander Tseung
c0e97d1739 Fix tests 2018-08-23 19:19:48 -07:00
Alexander Tseung
2d76ee754b Reduce large timeouts 2018-08-23 16:45:28 -07:00
Alexander Tseung
bdfd54ec54 Increase e2e timeouts for firefox 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
c06a0be486 Fix Firefox e2e tests 2018-08-23 16:45:28 -07:00
Alexander Tseung
62e2d5e01c Fix integration tests 2018-08-23 16:45:28 -07:00
Alexander Tseung
6670bc0e09 Fix e2e tests 2018-08-23 16:45:27 -07:00
Alexander Tseung
a430eed2d8 Fix integration tests 2018-08-23 16:45:27 -07:00
Alexander Tseung
5dcd8ceb7b Fix e2e tests 2018-08-23 16:45:27 -07:00
Alexander Tseung
9adf0c4b60 Fix integration tests 2018-08-23 16:45:27 -07:00
Alexander Tseung
c9ec5ed38d Fix e2e tests 2018-08-23 16:45:27 -07:00
Alexander Tseung
13c4ecd610 Fix tests 2018-08-23 16:45:27 -07:00
Esteban MIno
b59a1e91b8 typo watchAsset imageUrl to image 2018-08-23 15:54:40 -03:00
Evgeniy Filatov
b23cca1469 implemented improvements to RPC history 2018-08-23 01:18:13 +03:00
Alexander Tseung
01c0c98501 Add tabs support for PageContainer 2018-08-22 14:12:01 -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
Whymarrh Whitby
e803b8e047 Add test cases for MetaMaskController#_onKeyringControllerUpdate 2018-08-22 15:38:34 -02:30
Alexander Tseung
7294aede4f Add new variant for SenderToRecipient component 2018-08-22 10:53:20 -07:00
Esteban MIno
4e6c71e969 Merge branch 'develop' into WatchTokenFeature 2018-08-21 20:14:49 -03:00
Esteban MIno
6ccf2811e7 unit tests for watchAsset 2018-08-21 19:17:57 -03:00
brunobar79
90886c5e05 Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-08-21 15:58:29 -04:00
Dan J Miller
4704f3598e
Merge pull request #5108 from MetaMask/run-ganache-with-blocktime-flag 
Fix e2e tests: adapt ganache flags and remove unnecessary checks
 2018-08-21 15:26:23 -02:30
Dan Miller
9bd0ce46e8 Remove unnecessary checks and user actions in metamask-beta-ui.spec 2018-08-21 14:45:27 -02:30
Dan Miller
1718b83d20 Run ganache with a blocktime flag for npm:run:ganache:start. 2018-08-21 13:47:42 -02:30
brunobar79
54021fd90b fix unit tests 2018-08-21 00:09:54 -04:00
brunobar79
ab7eb73ecc fix merge conflicts 2018-08-20 21:51:35 -04:00