aboutsummaryrefslogtreecommitdiffstats
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
* feature: integrate gaba/CurrencyRateController (#6570)Paul Bouchon2019-06-012-80/+7
|
* transactions/deps - use broken out nonce-tracker module (#6555)Frankie2019-05-211-238/+0
|
* Improved UX for sweeping accounts (#6488)Etienne Dusseault2019-05-211-3/+21
| | | | | | | | | | | | * Changed max button to checkbox, disabled input if max mode is on, recalculate price according to gas fee if max mode is on * Disabled insufficient funds message in the modal if max mode is on, displays proper amounts in modal when max mode is on, sets the send amount according to custom gas price after gas modal save, resets the send amount after resetting custom gas price * Disabled max mode checkbox if gas buttons are loading, refactored gas-modal-page-container * Implemented new max button & max mode message. Moved insufficient funds error to underneath the send amount field * Fixed existing integration test to pass, created new tests to ensure send amount field is disabled when max button is clicked and the amount changes when the gas price is changed. Refactored some components
* drop transactions who's nonce is lower then the known network nonce but were ↵Frankie2019-05-161-5/+67
| | | | | | | | | | | | | | | | | | | | | | not included in a block (#6388) * transactions/pending - check nonce against the network and mark as dropped if not included in a block * transactions/pending - unifiy "dropped" txs * transactions/pending - test - fix for new expected behavior * fix comment * transactions/pending - clean up dropped event * fix spelling Co-Authored-By: frankiebee <frankie.diamond@gmail.com> * nit fix * test/tx-pending - clarify test description
* Adds e2e test for removing imported accounts. (#6615)Dan J Miller2019-05-161-2/+53
|
* feature: integrate gaba/ShapeShiftController (#6569)Paul Bouchon2019-05-151-1/+1
|
* Set a default value for code in _determineTransactionCategory (#6604)Dan J Miller2019-05-154-15/+259
| | | | | | | | | | * Set a default value for code in _determineTransactionCategory * Adds e2e tests that fail when token txs without gas param are not properly handled. * Adds unit tests for _determineTransactionCategory * Base error throwing and simple gas setting in estimateTxGas on transactionCategory
* Merge pull request #6568 from MetaMask/feature/gaba-phishing-controllerThomas Huang2019-05-112-58/+1
|\ | | | | feature: integrate gaba/PhishingController
| * feature: integrate gaba/PhishingControllerbitpshr2019-05-092-58/+1
| |
* | New settings custom rpc form (#6490)Dan J Miller2019-05-102-5/+8
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add networks tab to settings, with header. * Adds network list to settings network tab. * Adds form to settings networks tab and connects it to network list. * Network tab: form adding and editing working * Settings network form properly handles input errors * Add translations for settings network form * Clean up styles of settings network tab. * Add popup-view styles and behaviour to settings network tab. * Fix save button on settings network form * Adds 'Add Network' button and addMode to settings networks tab * Lint fix for settings networks tab addition * Fix navigation in settings networks tab. * Editing an rpcurl in networks tab does not create new network, just changes rpc of old * Fix layout of settings tabs other than network * Networks dropdown 'Custom Rpc' item links to networks tab in settings. * Update settings sidebar networks subheader. * Make networks tab buttons width consistent with input widths in extension view. * Fix settings screen subheader height in popup view * Fix height of add networks button in popup view * Add optional label to chainId and symbol form labels in networks setting tab * Style fixes for networks tab headers * Add ability to customize block explorer used by custom rpc * Stylistic improvements+fixes to custom rpc form. * Hide cancel button. * Highlight and show network form of provider by default. * Standardize network subheader name to 'Networks' * Update e2e tests for new settings network form * Update unit tests for new rpcPrefs prop * Extract blockexplorer url construction into method. * Fix broken styles on non-network tabs in popup mode * Fix block explorer url links for cases when provider in state has not been updated. * Fix vertical spacing of network form * Don't allow click of save button on network form if nothing has changed * Ensure add network button is shown in popup view * Lint fix for networks tab * Fix block explorer url preference setting. * Fix e2e tests for custom blockexplorer in account details modal changes. * Update integration test states to include frequentRpcList property * Fix some capitalizations in en/messages.json * Remove some console.logs added during custom rpc form work * Fix external account link text and url for modal and dropdown. * Documentation, url validation, proptype required additions and lint fixes on network tab and form.
* Check for unused function arguments (#6583)Whymarrh Whitby2019-05-0918-65/+65
| | | | | | | | | | * eslint: Check for unused function arguments * eslint: Ignore unused '_' in argument list Also allow any number of '_' e.g., '__' or '___' which is to be used sparingly * Remove and rename unused arguments
* Merge pull request #6577 from MetaMask/fix-integration-testsThomas Huang2019-05-084-7/+31
|\ | | | | Fix integration tests: completedUiMigration state and fetch + ethquery mocking
| * Fix fetch and ethquery mocks in integration testsDan Miller2019-05-084-7/+31
| |
* | Remove nock#restore call from actions.spec.jsWhymarrh Whitby2019-05-081-5/+0
|/ | | | | This call was unmocking all of our HTTP requests, allowing further test cases to hit the network. Calling nock#restore should not be required.
* Make height consistent on all row in send-content (#6480)Chi Kei Chan2019-04-181-3/+0
| | | | | | | | * Update all send-content row to 54px height * Remove header subtitle * Remove tests that check for send screen subheader
* Update confirm to use btn-primary (#6473)Chi Kei Chan2019-04-181-1/+1
| | | | | | | | * Update confirm to use btn-primary * Remove console * Fix e2e test
* Add token selection to the send screen (#6445)Chi Kei Chan2019-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move send to pages/ * Fix unit tests * Finish UI * Integrate asset dropdown to send actions * Remove console.log * Hide asset change during edit * Enable switch from send token to seand eth * Enable switching from token to eth when editing * Fix linter * Fixing test * Fix unit tests * Fix linter * Fix react warning; remove console.log * fix flat test * Add metrics * Address code review comments * Consistent spacing between send screen form rows. * Reduce height of gas buttons on send screen. * Make send screen gas button height dependent on size of contents.
* feature: add Goerli support (#6459)Paul Bouchon2019-04-185-5/+24
|
* Update buttons & colors to match design system (#6446)Chi Kei Chan2019-04-172-6/+6
| | | | | | | | | | | | | | | | * Refactoring button styles * renaming buttons * Add Link and Button styles * Update new btn styles and storybook * Fix tests * Change font weight; Update storybook * Fix linter
* Adds e2e test for most web3 methods that dapps use (#6160)Sneh Koul2019-04-175-0/+722
| | | | | | | | | | | | | | | | | | * schema added * ui for the dapp added and schema.js changed according to the comments in PR * added tests for all web3 methods * Update run-all.sh * Update web3.spec.js to work with new onboarding flow * changes made according to the comments * Create stand alone script for web3 e2e tests. * Lint fixes for web3 e2e tests.
* Remove NoticeController (#6382)Thomas Huang2019-04-025-196/+42
|
* Further e2e fixes in wake of #6364 and #6367 (#6374)Dan J Miller2019-03-291-16/+34
| | | | | | | | * getMethodData() default to abi decoded method if registry lookup errors * Update e2e tests to work with getMethodData() fallback changes * Remove indeterminency in gas input key entering in send token e2e test.
* Merge pull request #6364 from MetaMask/prevent-infura-requests-e2e-testsWhymarrh Whitby2019-03-294-50/+62
|\ | | | | Prevent infura requests in e2e tests
| * Split e2e run-all commands onto multiple linesWhymarrh Whitby2019-03-291-1/+2
| |
| * Run from-import e2e tests with additional account, to avoid conflict with ↵Dan Miller2019-03-292-4/+4
| | | | | | | | accounts in earlier test runs
| * Use localhost instead of mainnent/infura for custom rpc tests in e2e tests.Dan Miller2019-03-291-5/+5
| |
| * e2e: Update Contract Interaction wordingWhymarrh Whitby2019-03-291-3/+2
| |
| * e2e: Skip approving token testWhymarrh Whitby2019-03-291-1/+1
| |
| * e2e: Remove Privacy mode toggle stepWhymarrh Whitby2019-03-291-20/+0
| |
| * Retry transaction list item click in 'adds multiple transactions' tests ↵Dan Miller2019-03-291-1/+8
| | | | | | | | first click fails.
| * Default to localhost network when running e2e testsDan Miller2019-03-291-10/+0
| |
| * Use webRequest to cancel all requests to infura in e2e tests.Dan Miller2019-03-293-6/+41
| |
* | test - unit - ui - actions - setCompletedOnboarding - fix stub to call callbackkumavis2019-03-291-0/+2
| |
* | lint fixkumavis2019-03-291-1/+1
| |
* | notice-controller - make markAllNoticesRead synckumavis2019-03-291-1/+1
| |
* | lib - nodeify - correctly wrap synchronous functionskumavis2019-03-291-4/+45
| |
* | notices - markAllNoticesRead - use async/awaitkumavis2019-03-292-10/+6
| |
* | Merge branch 'develop' into clearNoticeskumavis2019-03-2917-38/+39
|\|
| * E2E - Dont close window notifications (#6349)Thomas Huang2019-03-261-2/+0
| | | | | | | | | | | | * Dont close window notifications * Remove commented out lines in beta spec
| * New settings page rebased (#6333)Dan J Miller2019-03-261-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * New setting tab * Add InfoTab * Add Advanced tab * Add Security Tab * Finish mobile view * Make new setting page responsive * Fix linter * Fix y scrolling * Update link in network dropdown * Fix e2e tests * Remove duplicate translation key * Resolve merge conflict * Only change settings header in popup view. * Place mobile-sync button in advanced-tab of settings
| * Replaces the coinbase link in the deposit modal with one for wyre (#6302)Dan J Miller2019-03-221-8/+3
| |
| * Folder restructure (#6304)Chi Kei Chan2019-03-2215-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove ui/app/keychains/ * Remove ui/app/img/ (unused images) * Move conversion-util to helpers/utils/ * Move token-util to helpers/utils/ * Move /helpers/*.js inside /helpers/utils/ * Move util tests inside /helpers/utils/ * Renameand move confirm-transaction/util.js to helpers/utils/ * Move higher-order-components to helpers/higher-order-components/ * Move infura-conversion.json to helpers/constants/ * Move all utility functions to helpers/utils/ * Move pages directory to top-level * Move all constants to helpers/constants/ * Move metametrics inside helpers/ * Move app and root inside pages/ * Move routes inside helpers/ * Re-organize ducks/ * Move reducers to ducks/ * Move selectors inside selectors/ * Move test out of test folder * Move action, reducer, store inside store/ * Move ui components inside ui/ * Move UI components inside ui/ * Move connected components inside components/app/ * Move i18n-helper inside helpers/ * Fix unit tests * Fix unit test * Move pages components * Rename routes component * Move reducers to ducks/index * Fix bad path in unit test
* | Remove exclusive testThomas Huang2019-03-211-1/+1
| |
* | Clear notices when setCompletedOnboarding is calledThomas Huang2019-03-212-0/+50
|/
* mascara - remove from project (#6283)kumavis2019-03-121-17/+0
|
* GABA: Integrate AddressBookController (#5847)Paul Bouchon2019-03-121-54/+0
| | | | | | * gaba: integrate AddressBookController * pin gaba version and update lockfile
* Metametrics (#6171)Dan J Miller2019-03-058-23/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add metametrics provider and util. * Add backend api and state for participating in metametrics. * Add frontend action for participating in metametrics. * Add metametrics opt-in screen. * Add metametrics events to first time flow. * Add metametrics events for route changes * Add metametrics events for send and confirm screens * Add metametrics events to dropdowns, transactions, log in and out, settings, sig requests and main screen * Ensures each log in is measured as a new visit by metametrics. * Ensure metametrics is called with an empty string for dimensions params if specified * Adds opt in metametrics modal after unlock for existing users * Adds settings page toggle for opting in and out of MetaMetrics * Switch metametrics dimensions to page level scope * Lint, test and translation fixes for metametrics. * Update design for metametrics opt-in screen * Complete responsive styling of metametrics-opt-in modal * Use new chart image on metrics opt in screens * Incorporate the metametrics opt-in screen into the new onboarding flow * Update e2e tests to accomodate metametrics changes * Mock out metametrics network requests in integration tests * Fix tx-list integration test to support metametrics provider. * Send number of tokens and accounts data with every metametrics event. * Update metametrics event descriptor schema and add new events. * Fix import tos bug and send gas button bug due to metametrics changes. * Various small fixes on the metametrics branch. * Add origin custom variable type to metametrics.util * Fix names of onboarding complete actions (metametrics). * Fix names of Metrics Options actions (metametrics). * Clean up code related to metametrics. * Fix bad merge conflict resolution and improve promise handling in sendMetaMetrics event and confrim tx base * Don't send a second metrics event if user has gone back during first time flow. * Collect metametrics on going back from onboarding create/import. * Add missing custom variable constants for metametrics * Fix metametrics provider * Make height of opt-in modal responsive. * Adjust text content for opt-in modal. * Update metametrics event names and clean up code in opt-in-modal * Put phishing warning step next to last in onboarding flow * Link terms of service on create and import screens of first time flow * Add subtext to options on the onboarding select action screen. * Fix styling of bullet points on end of onboarding screen. * Combine phishing warning and congratulations screens. * Fix placement of users if unlocking after an incomplete onboarding import flow. * Fix capitalization in opt-in screen * Fix last onboarding screen translations * Add link to 'Learn More' on the last screen of onboarding * Code clean up: metametrics branch * Update e2e tests for phishing warning step removal * e2e tests passing on metametrics branch * Different tracking urls for metametrics on development and prod
* First time flow updates (#6192)Dan J Miller2019-02-273-188/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Action select step of onboarding flow added. * Update navigation on create and import password screens. * Adds terms of service checkbox to create and import account screens. * Add security warning to jazzicon intro step * Update and streamline unique image to confirm seed steps of first time flow. * UI touch ups to welcome screen. * UI touch up on select action page * Fix first time import flow. * Add end of flow screen to first time flow * Replace unique image screen with updated fishing warning screen. * Update e2e tests for onboarding flow changes. * Add required translations to onboarding flow. * Update design of select action screen to emphasize create new wallet option. * Clean up onboarding flow code. * Remove notice related code from first-time-flow directory. * Use updater function argument in new-account.component
* Show/Hide Fiat on Testnets based on User Preference (#6153)Chi Kei Chan2019-02-271-10/+28
|
* Delete old-ui folderWhymarrh Whitby2019-02-214-196/+0
|
* Adds tests for advanced gas controls on confim screen (#6144)Dan J Miller2019-02-131-1/+47
|
* Add e2e tests adjusting gas before sendingWhymarrh Whitby2019-02-091-10/+90
|
* Remove betaUI preference state, replace with completedUiMigrationWhymarrh Whitby2019-02-051-5/+3
|
* e2e: Use close instead of save for gas modal (#6066)Thomas Huang2019-01-301-1/+2
|
* Add visual indicator when displaying a cached balance (#5854)Dan J Miller2019-01-302-0/+2
|
* I#5956 fix2 dont overwrite existing rpc settings (#6044)Frankie2019-01-301-0/+12
| | | | | | | | | | | | | | * mm-controller - dont overwrite existing rpc settings * ui-networkDropdown - dont pass old network as chainId * add methods preferencesController.updateRpc and metamaskController.updateAndSetCustomRpc * use updateAndSetCustomRpc in settings to allow rpcs to be updated * use new rpc as nickname if no nick name has been supplied * fix update rpc method
* Fix bugs in e2e tests related to gas customization inputs.Dan Miller2019-01-251-14/+17
|
* Add integration test for ordering of shapeshift txs in history list.Dan Miller2019-01-251-7/+15
|
* Fix integration testsAlexander Tseung2019-01-251-12/+8
|
* Refactor first time flow, remove seed phrase from state (#5994)Alexander Tseung2019-01-237-63/+124
| | | | | | | | | | | | | | | | | | | | * Refactor and fix styling for first time flow. Remove seed phrase from persisted metamask state * Fix linting and tests * Fix translations, initialization notice routing * Fix drizzle tests * Fix e2e tests * Fix integration tests * Fix styling * Fix migration naming from 030 to 031 * Open extension in browser when user has not completed onboarding
* I#5956 fix 1 (#6026)Frankie2019-01-181-0/+37
| | | | | * prevent invalid chainId's when adding cusstom rpcs * migration 30 removes invalid chaids from preferences and networkController for custom rpcs
* Clean up drizzle test runner scriptWhymarrh Whitby2019-01-041-10/+21
|
* Revert "remove error flags from drizzle setup"Whymarrh Whitby2019-01-041-0/+4
| | | | This reverts commit 938f4286e49dbdf7aef5b767917ad34ec6c6bb04.
* remove --unsafe-permBruno Barbieri2019-01-031-1/+1
|
* no globalsBruno Barbieri2019-01-031-3/+3
|
* Use sudo consistentlyBruno Barbieri2019-01-031-2/+2
|
* --unsafe-perm ?Bruno Barbieri2019-01-031-1/+1
|
* Dont use sudo to install truffleBruno Barbieri2019-01-011-1/+1
|
* Prevent users from changing the From field in the send screen (#5922)Alexander Tseung2018-12-141-20/+5
| | | | | | * Prevent users from changing the From field in the send screen * Fix integration tests
* Disallow loading as metamaskNetworkId (#5924)Frankie2018-12-141-2/+11
| | | | | | * transactions - throw an error if a transaction is generated while the network is loading * add tests for failing when netId is loading
* Adds network loading retry / error screen.Dan Miller2018-12-131-2/+2
|
* Ensures that advanced tab gas limit reflects tx gas limitDan Miller2018-12-121-0/+16
|
* Improve ux for low gas price set (#5862)Dan J Miller2018-12-112-1/+18
| | | | | | | | | | * Show user warning if they set gas price below safelow minimum, error if 0. * Properly cache basic price estimate data. * Default retry price to recommended price if original price was 0x0 * Use mock fetch in send-new-ui integration tests.
* Group transactions by nonce (#5886)Alexander Tseung2018-12-102-20/+10
|
* Final gas customization fixesDan Miller2018-12-041-1/+1
|
* Uses more reliable api on main send screen; caches basic api results in modalDan Miller2018-12-042-1/+4
|
* Remove gas customization integration tests (in favour of e2e tests)Dan Miller2018-12-041-35/+0
|
* Update e2e tests for new gas customization modal.Dan Miller2018-12-044-20/+61
|
* Adds createSpeedUpTransaction to txControllerDan Miller2018-12-041-0/+67
|
* Adds not yet functional gas price chart.Dan Miller2018-12-041-0/+2
|
* Save recent network balances in local storage (#5843)Dan J Miller2018-12-011-0/+137
| | | | | | | | | | | | * Use selector for state.metamask.accounts in all cases. * Default to cached balance when selecting metamask accounts * Adds the cached-balances controller * Documentation and small codes fixes for #5843 Co-Authored-By: danjm <danjm.com@gmail.com>
* Update e2e tests to handle any post-install window creationWhymarrh Whitby2018-11-273-9/+38
|
* Add JSDoc to closeAllWindowHandlesExcept e2e helper fnWhymarrh Whitby2018-11-271-0/+7
|
* Autofill gasPrice for retry attempts with either the recommended gasprice or ↵Frankie2018-11-271-1/+4
| | | | | | | | a %10 bump (#5786) * transactions - autofill gasPrice for retry attempts with either the recomened gasprice or a %10 bump * lint
* Merge pull request #5797 from MetaMask/trezor-v6Bruno Barbieri2018-11-221-30/+1
|\ | | | | Add Firefox and Brave support for Trezor
| * fix merge conflictsbrunobar792018-11-2110-34/+76
| |\
| * | clean upbrunobar792018-11-151-2/+2
| | |
| * | Merge branch 'trezor-v5' of github.com:MetaMask/metamask-extension into ↵brunobar792018-11-151-2/+2
| |\ \ | | | | | | | | | | | | trezor-v5
| | * | testbrunobar792018-11-151-4/+0
| | | |
| | * | testbrunobar792018-11-151-1/+1
| | | |
| | * | testbrunobar792018-11-151-1/+1
| | | |
| | * | try with custom boxbrunobar792018-11-151-1/+1
| | | |
| * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-153-8/+20
| |\ \ \ | | |/ / | |/| |
| * | | Merge branch 'develop' into trezor-v5brunobar792018-11-149-32/+2179
| |\ \ \
| * \ \ \ fix merge conflictsbrunobar792018-11-0714-180/+234
| |\ \ \ \
| * \ \ \ \ fix merge conflictsbrunobar792018-10-216-203/+43
| |\ \ \ \ \
| * \ \ \ \ \ fix conflictsbrunobar792018-10-1734-217/+3609
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-09-069-101/+348
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-08-223-16/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ fix merge conflictsbrunobar792018-08-2118-255/+402
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix e2e testsbrunobar792018-08-111-30/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #5334 from whymarrh/ui-switchWhymarrh Whitby2018-11-228-551/+37
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | Default to the new UI for first time users
| * | | | | | | | | | Remove first-time and navigate-txs integration testsWhymarrh Whitby2018-11-213-337/+0
| | | | | | | | | | |
| * | | | | | | | | | Add timeout to waitUntilXWindowHandles e2e helper fnWhymarrh Whitby2018-11-211-5/+16
| | | | | | | | | | |
| * | | | | | | | | | Update new UI e2e tests for new UI defaultWhymarrh Whitby2018-11-214-209/+21
| | | | | | | | | | |
* | | | | | | | | | | Version 5.0.3 (#5785)Dan Finlay2018-11-211-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Version 5.0.3 Includes a fix to the `version:bump` script that now correctly updates the changelog header. * Include inpage provider events
* | | | | | | | | | Fix rounding issue when sending max tokens (#5695)Alexander Tseung2018-11-202-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | | | | Auto fail transactions that have been approved for over 12 hours (#5765)Dan Finlay2018-11-171-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | | | | ESLint fixes (#5775)Whymarrh Whitby2018-11-172-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * eslint . --fix * Upgrade all ESLint warnings to errors
* | | | | | | | | | Tx controller now uses safe event emitter (#5769)Frankie2018-11-174-24/+28
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | | | remove error flags from drizzle setupbrunobar792018-11-151-4/+0
| | | | | | | | |
* | | | | | | | | Resubmit approved transactions on new block (#5752)Dan Finlay2018-11-152-4/+20
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | | Update Balanc3 API (#5744)Paul Bouchon2018-11-141-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update balanc3 API used in TokenRatesController * Remove demo URL and use nativeCurrency when fetching token rates
* | | | | | | | Fixes #3425: Better support for batch transactions (#5437)PaddyMc2018-11-143-5/+229
| | | | | | | |
* | | | | | | | Merge pull request #5674 from MetaMask/responsive-e2e-testsThomas Huang2018-11-104-18/+376
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | e2e tests for responsive behaviour
| * | | | | | | | Moves e2e tests for extension only behaviour to metamask-beta-responsive-ui.specDan Miller2018-11-084-18/+376
| | | | | | | | |
* | | | | | | | | Merge pull request #5481 from MetaMask/reducersThomas Huang2018-11-072-0/+1574
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | tests/Reducers
| * | | | | | | | Remove .onlyThomas2018-10-311-1/+1
| | | | | | | | |
| * | | | | | | | Readable tests, and set nextUnreadNotice to null when CLEAR_NOTICES is ↵Thomas2018-10-311-23/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dispatched
| * | | | | | | | Merge branch 'develop' into reducersThomas2018-10-3114-263/+1629
| |\| | | | | | |
| * | | | | | | | Isolate variables to individual testsThomas2018-10-311-53/+64
| | | | | | | | |
| * | | | | | | | ReducersThomas2018-10-102-0/+1491
| | | | | | | | |
* | | | | | | | | fix typobrunobar792018-11-071-1/+1
| | | | | | | | |
* | | | | | | | | update drizzle testsbrunobar792018-11-071-5/+20
| | | | | | | | |
* | | | | | | | | Update Connect Request screen design (#5644)Whymarrh Whitby2018-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | | | Increase timeout in Mascara testbitpshr2018-11-061-1/+1
| | | | | | | | |
* | | | | | | | | Fix beta e2e testsbitpshr2018-11-061-1/+1
| | | | | | | | |
* | | | | | | | | Cleanup after rebasebitpshr2018-11-061-1/+1
| | | | | | | | |
* | | | | | | | | EIP-1102: add user privacy optionbitpshr2018-11-062-29/+20
| | | | | | | | |
* | | | | | | | | EIP-1102: updated implementationbitpshr2018-11-065-110/+166
| | | | | | | | |
* | | | | | | | | Update watchAsset ERC20 validation (#5653)Esteban Miño2018-11-061-0/+26
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * update ERC20 token valodation for watchAsset * update ERC20 validation test descriptions
* | | | | | | | Add support for RPC endpoints with custom chain IDs (#5134)HackyMiner2018-10-264-11/+13
| | | | | | | |
* | | | | | | | Fix blockies icons overriding contract map icons. Refactor Identicon ↵Alexander Tseung2018-10-251-36/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | component (#5599)
* | | | | | | | Merge pull request #5570 from alextsg/i5558-account-display-widthkumavis2018-10-214-19/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix account display width for large currency values
| * | | | | | | | Fix account display width for large currency valuesAlexander Tseung2018-10-214-19/+19
| | | | | | | | |
* | | | | | | | | install truffle globallybrunobar792018-10-211-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #5555 from MetaMask/support-wallet-watch-assetkumavis2018-10-211-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Support for prefix wallet_watchAsset
| * | | | | | | add support for wallet_watchAssetEsteban MIno2018-10-201-0/+5
| | | | | | | |
* | | | | | | | specific add and remove methods for frequentRpcList (#5554)Esteban Miño2018-10-201-0/+19
|/ / / / / / /
* | | | | | | Extract Add Token button into its own componentWhymarrh Whitby2018-10-181-2/+2
| | | | | | |
* | | | | | | Delete add-token integration testWhymarrh Whitby2018-10-181-140/+0
| | | | | | |
* | | | | | | Adds toggle for primary currency (#5421)Alexander Tseung2018-10-174-61/+17
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | Ensure that new transactions added are using the selected addressWhymarrh Whitby2018-10-111-4/+26
| | | | | |
* | | | | | test - add actions unit tests (#5369)Thomas Huang2018-10-102-0/+1538
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Actions.spec.js * Error handling tests * Lint
* | | | | | Make all addresses EIP-55 compliant (#5379)bakaoh2018-10-101-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * Make all addresses EIP-55 compliant * Checksum autocompleted address but not during input
* | | | | tests - integration - Add Drizzle tests (#5467)Bruno Barbieri2018-10-103-2/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | Added account options on home screenSantiago Gonzalez Toral2018-10-101-0/+11
| | | | |
* | | | | Refactor buffer constructor (#5468)Noel Yoo2018-10-092-2/+2
| | | | |
* | | | | Fix typos (#5471)Noel Yoo2018-10-091-2/+2
| | | | |
* | | | | Merge pull request #5428 from alextsg/i5372-queue-orderDan Finlay2018-10-061-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Reverse pending transactions order
| * | | | | Reverse pending transactions orderAlexander Tseung2018-10-051-2/+2
| | | | | |
* | | | | | Increase suggested gas percentile to 65 (#5359)Dan Finlay2018-10-051-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | Add ability to whitelist a blacklisted domain at runtimeWhymarrh Whitby2018-10-021-0/+15
| | | | |
* | | | | Fix error message shown in assertElementNotPresent e2e helper fnWhymarrh Whitby2018-10-011-3/+1
| | | | |
* | | | | Don't log errors extraneously in e2e testsWhymarrh Whitby2018-10-011-1/+0
| | | | |
* | | | | Update e2e tests for adding mutliple custom RPC endpointsWhymarrh Whitby2018-10-011-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Switch string concatenation to template stringWhymarrh Whitby2018-10-011-1/+1
| | | | |
* | | | | Merge pull request #5332 from MetaMask/ui-unit-testsThomas Huang2018-09-2611-24/+1635
|\ \ \ \ \ | | | | | | | | | | | | Some Ui tests
| * | | | | Some Ui teststmashuang2018-09-2511-24/+1635
| | | | | |
* | | | | | Bugfix: Upgrade json-rpc-engine (#5348)Paul Bouchon2018-09-261-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Bugfix: bump version of json-rpc-engine * Increase delay * Update lockfile * deps - json-rpc-engine@3.7.4
* | | | | | Merge pull request #5282 from MetaMask/tx-cancel-uiAlexander Tseung2018-09-251-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add Cancel Transaction feature. Refactor modals. Add Transaction Details modal.
| * | | | | Fix integration testsAlexander Tseung2018-09-201-1/+1
| | | | | |
* | | | | | Refactor settings page to use JSX and follow component file folder structureAlexander Tseung2018-09-201-1/+1
|/ / / / /
* | | | | Implement latest EIP-712 protocolbitpshr2018-09-141-1/+1
| | | | |
* | | | | Fix tests. Add className to Identicon ethLogos.Alexander Tseung2018-09-134-10/+12
| | | | |
* | | | | Default NoticeController ctor opts to empty objWhymarrh Whitby2018-09-121-1/+1
| | | | |
* | | | | Delete ConfigManager, replacing its usages with PreferencesControllerWhymarrh Whitby2018-09-125-146/+46
| |_|_|/ |/| | |
* | | | fix conflictsEsteban MIno2018-08-298-101/+238
|\ \ \ \
| * | | | Revert changes to tx-list-items.json, and to mock getTransactionCount method ↵Dan Miller2018-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | in tx-list-items integration test.
| * | | | Fix testsAlexander Tseung2018-08-245-13/+13
| | | | |
| * | | | Reduce large timeoutsAlexander Tseung2018-08-241-6/+6
| | | | |
| * | | | Increase e2e timeouts for firefoxAlexander Tseung2018-08-241-7/+7
| | | | |
| * | | | Change "Outgoing" to "Sent Ether" or "Sent Token"Alexander Tseung2018-08-241-4/+4
| | | | |
| * | | | Fix Firefox e2e testsAlexander Tseung2018-08-241-2/+2
| | | | |
| * | | | Fix integration testsAlexander Tseung2018-08-241-1/+1
| | | | |
| * | | | Fix e2e testsAlexander Tseung2018-08-242-14/+6
| | | | |
| * | | | Fix integration testsAlexander Tseung2018-08-241-1/+1
| | | | |
| * | | | Fix e2e testsAlexander Tseung2018-08-241-58/+78
| | | | |
| * | | | Fix integration testsAlexander Tseung2018-08-245-21/+18
| | | | |
| * | | | Fix e2e testsAlexander Tseung2018-08-241-7/+7
| | | | |
| * | | | Fix testsAlexander Tseung2018-08-241-10/+7
| | | | |
| * | | | implemented improvements to RPC historyEvgeniy Filatov2018-08-231-0/+60
| | | | |
| * | | | Add tabs support for PageContainerAlexander Tseung2018-08-231-1/+1
| | | | |
| * | | | Merge pull request #5066 from whymarrh/fix-key-exportWhymarrh Whitby2018-08-231-0/+71
| |\ \ \ \ | | | | | | | | | | | | Don't re-render the export modal when the selected identity changes
| | * | | | Add test cases for MetaMaskController#_onKeyringControllerUpdateWhymarrh Whitby2018-08-231-0/+71
| | | |_|/ | | |/| |
| * / | | Add new variant for SenderToRecipient componentAlexander Tseung2018-08-231-2/+2
| |/ / /
* | | | watchAsset small changesEsteban MIno2018-08-281-1/+1
| | | |
* | | | typo watchAsset imageUrl to imageEsteban MIno2018-08-241-7/+7
| | | |
* | | | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-223-16/+3
|\| | |
| * | | Merge pull request #5108 from MetaMask/run-ganache-with-blocktime-flagDan J Miller2018-08-222-15/+2
| |\ \ \ | | | | | | | | | | Fix e2e tests: adapt ganache flags and remove unnecessary checks
| | * | | Remove unnecessary checks and user actions in metamask-beta-ui.specDan Miller2018-08-222-15/+2
| | | | |
| | * | | Run ganache with a blocktime flag for npm:run:ganache:start.Dan Miller2018-08-221-2/+2
| | | |/ | | |/|
| * / | fix unit testsbrunobar792018-08-211-1/+1
| |/ /
* / / unit tests for watchAssetEsteban MIno2018-08-221-0/+110
|/ /
* | Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-181-0/+62
|\ \
| * | Restores accounts until one with a zero balance is foundDan Matthews2018-08-171-0/+62
| | |
| * | Merge pull request #4279 from MetaMask/network-remove-provider-engineDan Finlay2018-08-1615-223/+266
| |\ \ | | | | | | | | Enhancement: New BlockTracker and Json-Rpc-Engine based Provider
| | * | Remove commented out code for detect-token-testThomas2018-08-151-10/+0
| | | |
| | * | E2E - Dont error on browser errorsThomas2018-08-151-1/+2
| | | |
| | * | Merge branch 'develop' into network-remove-provider-engineThomas2018-08-154-16/+228
| | |\| | | | | | | | | | | | | Override package-lock and fix merge conflicts
| | * | Confirms new contract token in the popupThomas2018-08-141-6/+6
| | | |
| | * | DelayThomas2018-08-091-0/+1
| | | |
| | * | confirms a deplay contract tx in the popupThomas2018-08-091-0/+9
| | | |
| | * | Use develop e2e beta testsThomas2018-08-081-109/+34
| | | |
| | * | lint fixesfrankiebee2018-08-081-2/+2
| | | |
| | * | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension ↵frankiebee2018-08-075-66/+48
| | |\ \ | | | | | | | | | | | | | | | into network-remove-provider-engine-tests
| | * \ \ Merge branch 'develop' into network-remove-provider-engine-testsThomas Huang2018-08-024-66/+140
| | |\ \ \
| | * | | | LintThomas Huang2018-07-311-2/+2
| | | | | |
| | * | | | Set metamask controller network provider to localhostThomas Huang2018-07-313-2/+24
| | | | | |
| | * | | | Disallow netConnections other than localhostsThomas2018-07-301-0/+4
| | | | | |
| | * | | | Detect Tokens are weirdThomas2018-07-301-26/+31
| | | | | |
| | * | | | Merge branch 'develop' into network-remove-provider-engineThomas2018-07-2619-301/+993
| | |\ \ \ \
| | * | | | | test - unit - remove tests for obsolete methodskumavis2018-07-041-52/+0
| | | | | | |
| | * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-07-0445-345/+367
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * | | | | | test - e2e - contract test - add logskumavis2018-07-041-7/+9
| | | | | | | |
| | * | | | | | test - e2e - fix missing importkumavis2018-07-031-1/+1
| | | | | | | |
| | * | | | | | test - e2e - move timingskumavis2018-07-031-1/+1
| | | | | | | |
| | * | | | | | test - e2e-beta - update some api callskumavis2018-07-031-6/+4
| | | | | | | |
| | * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-07-0312-207/+666
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * | | | | | | test - e2e - beta - from import - fix missing startup phasekumavis2018-06-121-0/+3
| | | | | | | | |
| | * | | | | | | test - e2e - beta - dont select localhost as it is already setkumavis2018-06-122-20/+1
| | | | | | | | |
| | * | | | | | | test - e2e - extensionUri should point to home.htmlkumavis2018-06-121-2/+2
| | | | | | | | |
| | * | | | | | | test - e2e - remove usage of extensionId from testskumavis2018-06-124-28/+12
| | | | | | | | |
| | * | | | | | | test - e2e - fix incomplete setup phasekumavis2018-06-122-2/+5
| | | | | | | | |
| | * | | | | | | test - e2e - properly export setupBrowserAndExtensionkumavis2018-06-121-0/+1
| | | | | | | | |
| | * | | | | | | test - e2e - more factoring of test setupkumavis2018-06-125-64/+27
| | | | | | | | |
| | * | | | | | | test - e2e - use fs-extra instead of fskumavis2018-06-121-1/+1
| | | | | | | | |
| | * | | | | | | test - e2e - factor out setup phase + rename METAMASK_CONFIG to ↵kumavis2018-06-123-46/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | METAMASK_TEST_CONFIG
| | * | | | | | | test - e2e - inject metamask config to point at localhostkumavis2018-06-121-11/+10
| | | | | | | | |
| | * | | | | | | test - e2e - reduce browser-specific codekumavis2018-06-121-20/+13
| | | | | | | | |
| | * | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-06-084-123/+154
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-06-073-0/+97
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-06-076-19/+49
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * | | | | | | | | | test - unit - tx-controller - fix blockTracker stubkumavis2018-05-291-0/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-05-295-2/+971
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * | | | | | | | | | | test - unit - pending-tx-tracker - update method namekumavis2018-05-291-2/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | test - unit - nonce-tracker - fix blockTracker stubkumavis2018-05-291-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | controllers - transactions - merge @frankiebee's work with minekumavis2018-05-292-56/+7
| | | | | | | | | | | | |
| | * | | | | | | | | | | test - unit - metamask-controller - remove logkumavis2018-05-261-1/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | test - unit - code style nitpickkumavis2018-05-251-1/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | test - unit - metamask-controller - fix many bugs in testskumavis2018-05-252-33/+61
| | | | | | | | | | | | |
| | * | | | | | | | | | | test - unit - run ganache-server in backgroundkumavis2018-05-251-0/+7
| | | | | | | | | | | | |
| | * | | | | | | | | | | test - unit - tx-controller-test - add history object to txMeta when using ↵kumavis2018-05-251-31/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | internal calls
| | * | | | | | | | | | | test - unit - move fetch polyfill to helperkumavis2018-05-253-6/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | test - unit - metamask-controller - polyfill global.fetchkumavis2018-05-251-2/+4
| | | | | | | | | | | | |
| | * | | | | | | | | | | test - remove .only from unit testskumavis2018-05-251-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'network-remove-provider-engine' of ↵frankiebee2018-05-2345-2170/+1226
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-05-2345-2170/+1226
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine
| | * | | | | | | | | | | | | transactions - update pending-tx-tracker to use the new block trackerfrankiebee2018-05-231-1/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | test pending-tx-tracker - update tests to reflect new block tracker behavior ↵frankiebee2018-05-231-32/+21
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and remove tx:confirmed event tests
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 00:32:41 +0800