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,499 Commits 2 Branches 0 Tags 265 MiB
b4d48ea3fc
Commit Graph

1159 Commits

Author SHA1 Message Date
brunobar79
9b1df386de fix merge conflicts 2018-11-20 17:44:28 -05:00
Dan Finlay
5956f8d260 Version 5.0.3 (#5785) 
* Version 5.0.3

Includes a fix to the `version:bump` script that now correctly updates
the changelog header.

* Include inpage provider events
 2018-11-20 08:34:14 -10:00
Alexander Tseung
4c87c05a02
Fix rounding issue when sending max tokens (#5695) 
* Fix rounding issue when sending max tokens

* Ensure amount row shows exact amount of max tokens on send screen (#2)

* Fix tests

* Change stored redux value from BigNumber to hex string. Fix TokenInput default value
 2018-11-19 16:06:34 -08:00
Dan Finlay
fdea642e6d
Auto fail transactions that have been approved for over 12 hours (#5765) 
* Auto fail transactions that have been approved for over 12 hours

Converts txs using a migration.

This migration uses a new helper function that generates tx-failing
migrations, and only requires a version, error message, and condition to
run on each transaction.

* Linted

* Only migrate approved txs to failed

* Cleanup

* Cleanup

* Small lint fixes
 2018-11-16 21:27:01 -08:00
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