aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ImgBot] Optimize images (#1) (#6829)filmendless2019-07-1034-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | *Total -- 5,450.78kb -> 4,473.66kb (17.93%) /images/404.png -- 38.48kb -> 11.19kb (70.91%) /images/deadface.png -- 8.14kb -> 4.50kb (44.67%) /images/cancel.png -- 10.67kb -> 6.04kb (43.38%) /app/images/key-32.png -- 1.08kb -> 0.68kb (37.66%) /app/images/coinswitch_logo.png -- 3.06kb -> 1.94kb (36.43%) /images/info-logo.png -- 31.80kb -> 20.43kb (35.77%) /docs/transaction-flow.png -- 137.82kb -> 91.38kb (33.7%) /ui/design/metamask-logo-eyes.png -- 142.65kb -> 94.94kb (33.45%) /images/coinbase logo.png -- 9.55kb -> 6.43kb (32.64%) /ui/design/chromeStorePics/screen_dao_accounts.png -- 505.47kb -> 347.03kb (31.34%) /docs/architecture.png -- 136.94kb -> 94.15kb (31.25%) /ui/design/chromeStorePics/screen_dao_locked.png -- 280.38kb -> 199.54kb (28.83%) /app/images/logo.png -- 6.43kb -> 4.58kb (28.81%) /ui/design/chromeStorePics/screen_wei_account.png -- 638.31kb -> 469.17kb (26.5%) /images/pw-128x128.png -- 92.76kb -> 69.18kb (25.42%) /app/images/pw128x128.png -- 92.76kb -> 69.18kb (25.42%) /app/images/shapeshift logo.png -- 17.13kb -> 13.54kb (20.92%) /ui/design/02b-metamask-AccDetails-Send.jpg -- 107.56kb -> 92.00kb (14.46%) /images/icon-128.png -- 5.63kb -> 4.82kb (14.45%) /ui/design/chromeStorePics/icon-128.png -- 5.63kb -> 4.82kb (14.45%) /ui/design/02a-metamask-AccDetails.jpg -- 114.81kb -> 99.73kb (13.14%) /ui/design/02a-metamask-AccDetails-OverTransaction.jpg -- 119.21kb -> 103.65kb (13.06%) /ui/design/02a-metamask-AccDetails-OverToken.jpg -- 118.99kb -> 103.62kb (12.92%) /ui/design/wireframes/metamask_wfs_jan_13.png -- 409.24kb -> 357.28kb (12.7%) /ui/design/chromeStorePics/screen_dao_notification.png -- 289.55kb -> 254.49kb (12.11%) /ui/design/05-metamask-Menu.jpg -- 127.21kb -> 111.93kb (12.01%) /app/images/ethereum-metamask-chrome.png -- 58.62kb -> 51.86kb (11.52%) /ui/design/chromeStorePics/final_screen_dao_accounts.png -- 243.86kb -> 217.46kb (10.82%) /ui/design/chromeStorePics/promo1400560.png -- 255.51kb -> 228.52kb (10.56%) /images/icon-512.png -- 41.09kb -> 36.95kb (10.08%) /ui/design/chromeStorePics/promo920680.png -- 201.87kb -> 181.88kb (9.9%) /ui/design/chromeStorePics/final_screen_wei_account.png -- 247.44kb -> 223.83kb (9.54%) /ui/design/chromeStorePics/final_screen_dao_locked.png -- 215.13kb -> 196.06kb (8.87%) /ui/design/chromeStorePics/final_screen_dao_notification.png -- 209.38kb -> 192.76kb (7.94%) /ui/design/00-metamask-SignIn.jpg -- 56.49kb -> 53.22kb (5.79%) /ui/design/03-metamask-Qr.jpg -- 64.50kb -> 60.89kb (5.6%) /ui/design/01-metamask-SelectAcc.jpg -- 74.28kb -> 70.34kb (5.3%) /ui/design/02-metamask-AccDetails.jpg -- 74.00kb -> 70.15kb (5.21%) /ui/design/chromeStorePics/promo440280.png -- 56.12kb -> 53.92kb (3.93%) /app/images/icon-64.png -- 3.49kb -> 3.40kb (2.66%) /ui/design/chromeStorePics/icon-64.png -- 3.49kb -> 3.40kb (2.66%) /images/pw-48x48.png -- 3.20kb -> 3.16kb (1.34%) /ui/design/chromeStorePics/final_screen_wei_notification.png -- 189.32kb -> 187.93kb (0.73%) /images/icon-32.png -- 1.69kb -> 1.68kb (0.46%)
* Capitalized speed up label to match rest of UI (#6828)Brian Soule2019-07-102-1/+2
|
* Create MetaFoxLogo component (#6819)ryanml2019-07-1010-91/+73
|
* Replace deprecated shell-parallel with concurrently (#6807)Whymarrh Whitby2019-07-105-165/+704
| | | | | | * Replace shell-parallel with concurrently * Update ganache-cli
* Remove job-screens CI job (#6823)Whymarrh Whitby2019-07-095-441/+17
| | | | | * Remove job-screens CI job * Remove unused dependencies, now that job-screens is gone
* Address various UI styling issues (#6744)Dan J Miller2019-07-0917-175/+155
| | | | | | | | | | | | | | * Add loading spinner to pending tx status label. * Add border around account icon in top right * Change style of settings toggle buttons; wrap with local components * Eliminate large space after settings labels when no description * Remove network form from advanced tab of settings * Keep new account container height to contents when in full screen
* Replace react-addons-css-transition-group (#6816)Mark Stacey2019-07-085-35/+73
| | | | | | | | | This package is deprecated, and is incompatible with React v16. It has been replaced by `react-test-renderer`, which has a drop-in replacement for `react-addons-css-transition-group`. Strangely, `react-test-renderer` was already listed as a dependency despite not being used. I had to downgrade it, as the version already listed was for React v16, and we're still using React v15.
* Remove `husky` from lockfile (#6815)Mark Stacey2019-07-061-99/+0
| | | | | This must have been removed as a dependency at some point, but left in the lockfile. I noticed it would install itself whenever I reinstalled all packages.
* Remove unused `babel-polyfill` dependency (#6814)Mark Stacey2019-07-061-1/+0
| | | | The lockfile hasn't changed because this package is a dependency of `fetch-mock`.
* Remove unused Babel transformations (#6811)Mark Stacey2019-07-063-182/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | The `stage-0` Babel preset has been replaced with the specific Babel plugins that we depend upon. We don't use most of `stage-0`, so this allowed us to remove many unnecessary transformations. We had to remove this preset soon anyway, because all of the stage presets are deprecated in Babel 7. The `stage-0` preset consisted of these plugins: ``` "transform-do-expressions" "transform-function-bind" "transform-class-constructor-call" "transform-export-extensions" "transform-class-properties" "transform-decorators" "syntax-dynamic-import" "syntax-trailing-function-commas" "transform-async-generator-functions" "transform-async-to-generator" "transform-exponentiation-operator" "transform-object-rest-spread" ``` Of that list, only 'transform-class-properties', 'transform-object- rest-spread', and 'transform-async-to-generator' were being used.
* Remove unused `gulp-uglify` dependency (#6810)Mark Stacey2019-07-062-40/+0
| | | | The switch was made to `gulp-uglify-es` some time ago, but `gulp-uglify` was never removed.
* Declare variables before use (#6806)Mark Stacey2019-07-068-97/+99
| | | | | | | | | | | | | | | | While working on #6805, I noticed that many variables were being used before they were declared. Technically this worked fine in practice because we were using the `transform-es2015-block-scoping` Babel plugin, which transforms `let` and `const` to `var`, which is hoisted. However, after removing that Babel transformation, many things broke. All instances of variables or classes being used before declared have been fixed. The `no-use-before-define` eslint rule has been added to catch these cases going forward. The rule is disabled for function declarations for the moment, because those are always hoisted. We could disable that too if we want to, but it's purely stylistic and would require a lot more changes.
* Added visual documentation of the account menu component (#6775)Mark O'Sullivan2019-07-052-0/+21
| | | | | | | | | | * Added visual documentation of the menu bar component * updated CHANGELOG.md * renamed to account menu which is the component highlighted in the screenshot * updated contributions document
* Check for invalid gas estimates from local storage (#6800)Mark Stacey2019-07-058-139/+347
| | | | | | | | | | | | | | | | | | | | | | | | * Remove unused state 'gas.basicPriceAndTimeEstimates' * Check for invalid estimates from local storage Gas estimates were being cached in local storage then later retrieved, but the retrieved values were not being checked. If the data failed to save, failed to load, or was cleared since being saved, it would result in the gas estimates being set to undefined. The estimates retrieved from local storage are now checked before they are used. If they are falsy, the estimates are retrieved from the network instead. This should fix this Sentry issue: [METAMASK-6W0T](https://sentry.io/share/issue/cfe470314a5741768b19050815322aa4/) A few additional changes were made to the gas-duck tests to accommodate the use of `sinon.restore`. `restore` is strongly recommended by the `sinon` team, as neglecting to use it can result in memory leaks. It has the additional benefit of ensuring you create fresh stubs/spies for each test, which means they no longer need to be reset between tests.
* Remove `disc` (#6801)Mark Stacey2019-07-044-213/+0
| | | | | The `disc` gulp command no longer works. I wasn't able to fix this easily, so instead it has been removed. We can probably find something better to replace it with.
* Increase CircleCI `addons-linter` memory (#6802)Mark Stacey2019-07-041-1/+1
| | | | | | `addons-linter` will occasionally run out of heap space. This provides 3 GB of heap for that script rather than the default ~1.5 GB. The CircleCI containers have 4GB of memory, so this should leave plenty of extra space for non-heap memory.
* Remove UiMigrationAnnouncement and associated state (#6794)Whymarrh Whitby2019-07-0416-133/+0
|
* Omit integration tests from default test script (#6803)Mark Stacey2019-07-041-1/+1
| | | | | | The integration tests are slow, and rather inconvenient to run in development on a regular basis (they break if you move the mouse). They have been removed from the `test` script, to make running `test` frequently during development less painful.
* Reduce time to show tx "speed up" buttons to 5 seconds. (#6797)Dan Finlay2019-07-041-1/+1
|
* Fix PropType warning (#6792)Mark Stacey2019-07-041-1/+1
|
* Add Mark Stacey (Kyokan) to UI CodeOwners (#6798)Dan Finlay2019-07-041-1/+1
|
* Move e2e tests out of beta dir (#6785)Whymarrh Whitby2019-07-0318-374/+22
|
* Update eth-contract-metadata to use published registry version (#6784)Whymarrh Whitby2019-07-032-13/+15
|
* Update asmcrypto.js to latest version (#6767)Mark Stacey2019-07-033-5/+7
| | | | | | | | | | | | This silences a warning message that was printed to the console whenever this module was loaded during tests. The API changes between these two versions were reviewed carefully for differences. The only difference made was to `PBKDF2_HMAC_SHA256.bytes`, which was replaced by `Pbkdf2HmacSha256`. The length argument no longer has a default value, so it has been set to match what the default value was in the previous version we used, which is 32 (the SHA256 hash size).
* Added Confirmation Modal for Delete Network (#6776)Akshit Kr Nagpal2019-07-0210-17/+114
|
* Move Browserify transforms to gulpfile (#6768)Mark Stacey2019-07-022-7/+3
| | | | | | | | | | | | The flat tests also rely upon these transformations, yet invoke browserify from the command line rather than using the gulpfile. The transformations have been specified on the command line for those instead. Of course it's not ideal to have the same transformations listed in two different places, but the plan is to delete the flat tests soon anyway, so this should suffice until then. Closes #4538
* Merge pull request #6765 from MetaMask/masterDan Finlay2019-07-0212-41/+168
|\ | | | | Using admin privilege to bypass code owner review because it has already [been reviewed](https://github.com/MetaMask/metamask-extension/pull/6763) and those code owners are out today.
| * Fix whitespaceDan Finlay2019-07-021-1/+1
| |
| * Re-enable sourcemaps publishingDan Finlay2019-07-021-15/+15
| |
| * Merge pull request #6778 from MetaMask/DisableReleaseScriptDan Finlay2019-07-021-13/+13
| |\ | | | | | | Disable release script from CircleCI
| | * Disable release script from CircleCIDan Finlay2019-07-021-13/+13
| |/ | | | | | | | | | | | | | | | | | | The MetaMask bot is currently failing to publish docs updates, and it is [blocking our ability to release new versions](https://github.com/MetaMask/metamask-extension/pull/6765). While we should pursue a proper fix, I think it's worth disabling in the meanwhile so this glitch doesn't interfere with our regular release cadence further.
| * Merge pull request #6764 from MetaMask/Version-6.7.1Dan Finlay2019-06-2810-31/+145
| |\ | | | | | | Version 6.7.1
| | * Version 6.7.1v6.7.1Mark Stacey2019-06-282-1/+4
| | |
| | * Fixes display of confirm screen token decimals by not relying on ↵Dan Miller2019-06-286-14/+117
| | | | | | | | | | | | confirmTransaction state.
| | * Adds e2e tests that fail when token decimals are displaying incorrectly.Dan Miller2019-06-282-16/+24
| |/
| * Merge pull request #6749 from MetaMask/v6.7.0Dan Finlay2019-06-2725-263/+390
| |\ | | | | | | V6.7.0
| | * Version 6.7.0v6.7.0Thomas2019-06-262-1/+10
| | |
| | * Add simulation failure to tx confirmation when transaction simulationFailsThomas2019-06-261-0/+4
| | |
| * | Merge pull request #6721 from MetaMask/Version-6.6.2Thomas Huang2019-06-1844-7122/+21293
| |\ \ | | | | | | | | Version 6.6.2
| * \ \ Merge pull request #6695 from MetaMask/developDan Finlay2019-06-075-64/+15
| |\ \ \ | | | | | | | | | | Develop to master
| * \ \ \ Merge pull request #6683 from MetaMask/developThomas Huang2019-06-0554-1660/+2579
| |\ \ \ \ | | | | | | | | | | | | Merge dev to master
| * \ \ \ \ Merge pull request #6616 from MetaMask/developThomas Huang2019-05-164-3/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | Update master for 6.5.2 production release
| * \ \ \ \ \ Merge pull request #6599 from MetaMask/developDan Finlay2019-05-15154-1337/+3403
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Master Version Bump (v6.5.0)
| * \ \ \ \ \ \ Merge pull request #6523 from MetaMask/developThomas Huang2019-04-279-35/+40
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update master with 6.4.1 Release
| * \ \ \ \ \ \ \ Merge pull request #6484 from MetaMask/developDan Finlay2019-04-25233-648/+2002
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update master branch with develop (v6.4.0)
| * \ \ \ \ \ \ \ \ Merge pull request #6419 from MetaMask/developThomas Huang2019-04-0942-2575/+303
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Merge develop into master
* | | | | | | | | | | Validate txParams in TransactionStateManager.addTx (#6713)Akshit Kr Nagpal2019-06-292-6/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Normalize and Validate txParams in TransactionStateManager.addTx too * Added Tests * Updated normalizeAndValidateParams to return the new txParams
* | | | | | | | | | | Merge pull request #6759 from Gudahtt/node-v10Dan Finlay2019-06-284-31/+29
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update to Node.js v10
| * | | | | | | | | | | Update to Node.js v10Mark Stacey2019-06-274-31/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only package that needed to be updated was `sha3`. It has been updated to v1.2.3, which is a maintenance release that supports up to Node.js v12.
* | | | | | | | | | | | Handle invalid strings during seed phrase import (#6743)Whymarrh Whitby2019-06-282-4/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add tests for ImportWithSeedPhrase#parseSeedPhrase * Handle importing whitespace-only seed phrases Fixes #6694 This changeset fixes our parsing of seed phrases during import to handle the case where a user tries to import a seed phrase that consists solely of whitespace. We no longer produce an error and instead treat it as an incorrect seed phrase. * Handle importing more invalid seed phrases
* | | | | | | | | | | | Fix seed phrase import back button (#6758)Mark Stacey2019-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The back button on the import seed phrase page leaves the Redux store with `appState.forgottenPassword` set to true, which prevents the user from logging in. That flag is now unset when the user leaves the page. Fixes #6740
* | | | | | | | | | | | Refactor account-details-modal (#6751)Mark Stacey2019-06-275-108/+116
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the AccountDetailsModal to follow newer conventions. Changes include: - Create a directory for the component with separate files for the component, the container, and the entrypoint. - Use jsx rather than hyperscript Fixes #6741
* | | | | | | | | | | Generate complete source maps (#6756)Mark Stacey2019-06-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The source maps generated previously were mapping the bundled files to the post-Babel files - they weren't showing mapping to the source files as written. It looks like this was a result of `reactify` being used in addition to babel - that transformation must have dropped the source maps. `reactify` still needs to be listed as a dependency because it is an unlisted requirement of the `boron` package, which we use. We don't need to use it to create our bundles though, as Babel already performs the transformations we need.
* | | | | | | | | | | Fixes #6760, correct PropTypes for nextRoute (#6761)ryanml2019-06-271-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Use inline source maps in development (#6754)Mark Stacey2019-06-271-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is currently a bug in chrome that prevents reading source maps from a local file [0]. This was preventing Chrome DevTools from using our JavaScript source maps, where were saved as `.map` files. To work around this problem the source maps are now generated inline, which seems to work fine. The only other browser I tested this with was Firefox, which works both before and after this change. [0]: https://bugs.chromium.org/p/chromium/issues/detail?id=931675
* | | | | | | | | | | Merge pull request #6589 from MetaMask/DocumentHotfixProtocolDan Finlay2019-06-261-0/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Document hotfix protocol
| * | | | | | | | | | | Document hotfix protocolDan Finlay2019-05-101-0/+13
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6738 from whymarrh/lockfile-reviewerWhymarrh Whitby2019-06-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add codeowner for package*.json files
| * | | | | | | | | | | | Add codeowner for package*.json filesWhymarrh Whitby2019-06-211-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6735 from whymarrh/node-8.16Whymarrh Whitby2019-06-262-17/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Node 8.16
| * | | | | | | | | | | | | ci: Update to Node 8.16 Docker imagesWhymarrh Whitby2019-06-201-16/+16
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | nvm: Update to 8.16Whymarrh Whitby2019-06-201-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #6736 from whymarrh/unused-depsWhymarrh Whitby2019-06-252-458/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused dependencies
| * | | | | | | | | | | | | Uninstall unused jshint-stylishWhymarrh Whitby2019-06-212-24/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused promptWhymarrh Whitby2019-06-212-121/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Sort deps correctlyWhymarrh Whitby2019-06-211-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused react-addons-test-utils & react-testutils-additionsWhymarrh Whitby2019-06-212-32/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | sync lockfile dev flagsWhymarrh Whitby2019-06-211-20/+59
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused sandwich-expando, semaphore, semver, & shallow-copyWhymarrh Whitby2019-06-212-47/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused react-markdown dependencyWhymarrh Whitby2019-06-212-144/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused pumpifyWhymarrh Whitby2019-06-211-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused pojo-migratorWhymarrh Whitby2019-06-212-6/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused multiplexWhymarrh Whitby2019-06-212-18/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused fast-levenshteinWhymarrh Whitby2019-06-211-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused lodash.uniqbyWhymarrh Whitby2019-06-211-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused eth-hd-keyringWhymarrh Whitby2019-06-211-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused lodash.memoizeWhymarrh Whitby2019-06-211-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused hatWhymarrh Whitby2019-06-212-6/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused identicon.jsWhymarrh Whitby2019-06-212-6/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused extension-link-enablerWhymarrh Whitby2019-06-212-9/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused eth-bin-to-opsWhymarrh Whitby2019-06-212-10/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Uninstall unused ensnareWhymarrh Whitby2019-06-212-9/+0
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Update README test instructionsMark Stacey2019-06-251-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Omit requiring mocha to be installed globally; this is not required for any of the listed commands. Also update the `lint` command to use the npm script, as the gulp command referenced doesn't exist.
* | | | | | | | | | | | | Fix 'watch' npm scriptMark Stacey2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `watch` npm script did not work - it must have gone unused for some time. The following changes were required for it to work: * Use the `--watch` flag, rather than the `watch` command (which appears to not exist) * Set the `METAMASK_ENV` environment variable to "test" * Include the tests in the `ui` directory * require the `test/setup.js` file before running the tests The reporter was also changed to `min`, which is generally recommended for use with the `--watch` flag.
* | | | | | | | | | | | | Merge pull request #6745 from MetaMask/fix-readmeWhymarrh Whitby2019-06-251-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update commands in README for building locally
| * | | | | | | | | | | | | Clarify dev build (`npm start`) in READMEWhymarrh Whitby2019-06-251-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Update commands in README for building locallyWhymarrh Whitby2019-06-241-6/+4
| |/ / / / / / / / / / / /
* / / / / / / / / / / / / Remove shapeshift deposit form (#6746)Mark Stacey2019-06-2528-434/+2
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Closes #6478
* | | | | | | | | | | | Add loading view to notification.html (#6648)Chi Kei Chan2019-06-202-1/+24
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6731 from bbondy/developDan Finlay2019-06-201-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add brave as a platform type for MetaMask
| * | | | | | | | | | | | Add brave as a platform type for MetaMaskBrian R. Bondy2019-06-201-0/+2
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6728 from MetaMask/i#6724Dan Finlay2019-06-202-8/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | transactions - always hexprefix txParams on update; fixes #6724
| * | | | | | | | | | | transactions - always hexprefix txParams on update; fixes #6724frankiebee2019-06-192-8/+6
|/ / / / / / / / / / /
* | | | | | | | | | | 4byte fallback (#6551)Whymarrh Whitby2019-06-1823-262/+376
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adds 4byte registry fallback to getMethodData() (#6435) * Adds fetchWithCache to guard against unnecessary API calls * Add custom fetch wrapper with abort on timeout * Use opts and cacheRefreshTime in fetch-with-cache util * Use custom fetch wrapper with timeout for fetch-with-cache * Improve contract method data fetching (#6623) * Remove async call from getTransactionActionKey() * Stop blocking confirm screen rendering on method data loading, and base screen route on transactionCategory * Remove use of withMethodData, fix use of knownMethodData, in relation to transaction-list-item.component * Load data contract method data progressively, making it non-blocking; requires simplifying conf-tx-base lifecycle logic. * Allow editing of gas price while loading on the confirm screen. * Fix transactionAction component and its unit tests. * Fix confirm transaction components for cases of route transitions within metamask. * Only call toString on id if truthy in getNavigateTxData() * Fix knownMethodData retrieval and data fetching from fourbyte
* | | | | | | | | | | Merge pull request #6698 from MetaMask/Version-6.6.2Thomas Huang2019-06-182-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | Version 6.6.2 RC1
| * | | | | | | | | | Merge branch 'develop' into Version-6.6.2Thomas Huang2019-06-1839-241/+422
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | remove broken readme link (#6720)bobby dresser2019-06-181-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Add delete to custom RPC form (#6718, #6650)Dan J Miller2019-06-1711-60/+229
| | | | | | | | | | |
* | | | | | | | | | | Fix styles on 'import account' page, update help link (#6700)Kirill Goncharov2019-06-173-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix styles on 'import account' page, update help link * Update changelog
* | | | | | | | | | | Wrap smaller custom block explorer url text (#6714)Thomas Huang2019-06-174-3/+16
| | | | | | | | | | |
* | | | | | | | | | | MetaMorph - Spacing and Typeface on Extension Main view (#6584)Chi Kei Chan2019-06-1319-171/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * wip * Style Update: Mobile App Header * wip * Style Update: mobile menu-bar * Style Update: Primary and Secondary balance on mobile main view * Style Update: Spacing for transaction-list and transaction-list-item * Address PR Comments * Fix full-width view * line-height fixes
* | | | | | | | | | | Feature: sync with mobile v2 (#6673)Esteban Miño2019-06-121-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * handle two steps * generate new qr each 30 secs * handle change of channel cipher without changing qr code * fix typo
* | | | | | | | | | | pin ethereumjs-tx (#6706)Thomas Huang2019-06-111-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Version 6.6.2 RC1v6.6.2Dan Finlay2019-06-082-1/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #6690 from MetaMask/npm-auditThomas Huang2019-06-075-6881/+20867
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | Re-enable npm audit CI job
| * | | | | | | | | ci: Enable npm audit checkWhymarrh Whitby2019-06-073-13/+49
| | | | | | | | | |
| * | | | | | | | | Successful `npm audit' with all required pkgsWhymarrh Whitby2019-06-072-0/+11545
| | | | | | | | | |
| * | | | | | | | | npm audit: Works with gaba but w/o ganache-coreWhymarrh Whitby2019-06-072-6283/+365
| | | | | | | | | |
| * | | | | | | | | npm audit: Break karma, 1 less low, 1 less highWhymarrh Whitby2019-06-072-661/+234
| | | | | | | | | |
| * | | | | | | | | npm audit: Use eth-json-rpc-infura@3Whymarrh Whitby2019-06-072-267/+438
| | | | | | | | | |
| * | | | | | | | | Move eth-json-rpc-middleware into prod dependenciesWhymarrh Whitby2019-06-072-118/+91
| | | | | | | | | |
| * | | | | | | | | Break Storybook-related pkgs to reduce listed vulnerabilitiesWhymarrh Whitby2019-06-072-3182/+8282
| | | | | | | | | |
| * | | | | | | | | npm audit fixWhymarrh Whitby2019-06-072-2488/+3951
| | | | | | | | | |
| * | | | | | | | | npm audit: Works with eth-trezor-keyringWhymarrh Whitby2019-06-072-0/+122
| | | | | | | | | |
| * | | | | | | | | npm audit: Works with eth-ledger-bridge-keyringWhymarrh Whitby2019-06-072-0/+86
| | | | | | | | | |
| * | | | | | | | | npm audit: Works with eth-json-rpc-middlewareWhymarrh Whitby2019-06-072-36/+231
| | | | | | | | | |
| * | | | | | | | | npm audit: Works with eth-json-rpc-filtersWhymarrh Whitby2019-06-072-0/+251
| | | | | | | | | |
| * | | | | | | | | npm audit: Works with eth-json-rpc-infuraWhymarrh Whitby2019-06-072-0/+2644
| | | | | | | | | |
| * | | | | | | | | Add ethereumjs-tx dependency backWhymarrh Whitby2019-06-072-3/+38
| | | | | | | | | |
| * | | | | | | | | Successful `npm audit' run w/o some packagesWhymarrh Whitby2019-06-072-1290/+0
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following packages have been removed as I work to figure out what is causing npm audit to produce errors: eth-json-rpc-filters eth-json-rpc-infura eth-json-rpc-middleware eth-ledger-bridge-keyring eth-trezor-keyring ethereumjs-tx gaba These packages will slowly be added back in forthcoming commits.
* | | | | | | | | Merge pull request #6692 from MetaMask/Version-6.6.1Jenny Pollack2019-06-072-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Version 6.6.1 RC1
| * | | | | | | | | Version 6.6.1 RC1v6.6.1Dan Finlay2019-06-072-1/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #6691 from MetaMask/revert-6606Dan Finlay2019-06-073-63/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Revert "Improve ENS Address Input"
| * | | | | | | | Revert "fixed #5524"Jenny Pollack2019-06-073-63/+10
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c8cb4ba3705478a16cd1e39f8edc1f277bb2ede6.
* | | | | | | | Merge pull request #6679 from MetaMask/Version-6.6.0v6.6.0Thomas Huang2019-06-052-1/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Version 6.6.0
| * | | | | | | | Version 6.6.0 RC1Dan Finlay2019-06-042-1/+8
|/ / / / / / / /
* | | | | | | | Merge pull request #6678 from MetaMask/revert-6654-manifest-permissionsDan Finlay2019-06-041-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Revert "Remove clipboardWrite permission"
| * | | | | | | | Revert "Remove clipboardWrite permission"Dan Finlay2019-06-041-0/+1
|/ / / / / / / /
* | | | | | | | feature: integrate gaba/CurrencyRateController (#6570)Paul Bouchon2019-06-017-8102/+7829
| | | | | | | |
* | | | | | | | Merge pull request #6654 from whymarrh/manifest-permissionsDan Finlay2019-06-011-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove clipboardWrite permission
| * | | | | | | | Remove clipboardWrite permissionWhymarrh Whitby2019-05-241-1/+0
| | | | | | | | |
* | | | | | | | | Merge pull request #6671 from MetaMask/bugfix/enable-rejectionDan Finlay2019-06-011-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | bugfix: reject enable promise on user rejection
| * | | | | | | | | bugfix: reject enable promise on user rejectionbitpshr2019-06-011-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #6402 from ↵Thomas Huang2019-05-3110-8340/+9056
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pldespaigne/issue#5742_update_ens_resolver_to_eip_1577 ✔️ Issue #5742 update ens resolver to eip 1577
| * \ \ \ \ \ \ \ \ mergepldespaigne2019-05-31361-2571/+6170
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #6659 from matkam/developThomas Huang2019-05-291-8/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Enable Ledger hardware wallet support on Firefox
| * | | | | | | | | | lint cleanupMathew Kamkar2019-05-251-2/+0
| | | | | | | | | | |
| * | | | | | | | | | Enable Ledger hardware wallet support on FirefoxMathew Kamkar2019-05-251-6/+0
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | Firefox 67 support U2F by default
* | | | | | | | | | Merge pull request #6652 from whymarrh/clean-editorconfigWhymarrh Whitby2019-05-241-15/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Cleanup EditorConfig file
| * | | | | | | | | | Clean EditorConfig fileWhymarrh Whitby2019-05-231-15/+0
| | |/ / / / / / / / | |/| | | | | | | |
* / | | | | | | | | Ensures that transactions cannot be confirmed if gas limit is below 21000. ↵Dan J Miller2019-05-232-2/+24
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | (#6625)
* | | | | | | | | transactions/deps - use broken out nonce-tracker module (#6555)Frankie2019-05-215-407/+74
| | | | | | | | |
* | | | | | | | | Fix grammatical error in i18n endOfFlowMessage6 (#6633)Chi Kei Chan2019-05-211-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #6632 from whymarrh/fix-lintThomas Huang2019-05-211-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unused fn arguments in AmountMaxButton
| * | | | | | | | | Remove unused fn arguments in AmountMaxButtonWhymarrh Whitby2019-05-211-1/+1
|/ / / / / / / / /
* | | | | | | | | MetaMetrics documentation (#6624)Dan J Miller2019-05-212-9/+115
| | | | | | | | |
* | | | | | | | | Update translation (#6628)matteopey2019-05-211-4/+230
| | | | | | | | |
* | | | | | | | | Improved UX for sweeping accounts (#6488)Etienne Dusseault2019-05-2120-55/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | | | Merge pull request #6621 from MetaMask/Version-6.5.3Thomas Huang2019-05-172-1/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Version 6.5.3 RC1
| * | | | | | | | | Version 6.5.3 RC1v6.5.3Dan Finlay2019-05-162-1/+8
|/ / / / / / / / /
* | | | | | | | | Merge pull request #6619 from MetaMask/bugfix/enable-lockedDan Finlay2019-05-161-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | bugfix: show extension window if locked regardless of approval
| * | | | | | | | | bugfix: show extension window if locked regardless of approvalbitpshr2019-05-161-1/+2
|/ / / / / / / / /
* | | | | | | | | drop transactions who's nonce is lower then the known network nonce but were ↵Frankie2019-05-163-13/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge pull request #6606 from industral/issue-5524Thomas Huang2019-05-163-10/+63
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve ENS Address Input
| * | | | | | | | | fixed #5524Alex Ivasyuv2019-05-153-10/+63
| | | | | | | | | |
* | | | | | | | | | Adds e2e test for removing imported accounts. (#6615)Dan J Miller2019-05-162-3/+54
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge pull request #6614 from MetaMask/Version-6.5.2v6.5.2Dan Finlay2019-05-162-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Verison 6.5.2
| * | | | | | | | | Version BumpThomas Huang2019-05-152-1/+4
|/ / / / / / / / /
* | | | | | | | / Fixes bugs in 6.5.1 (#6613)Bruno Barbieri2019-05-152-2/+2
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix bg error * fix ui exception
* | | | | | | | Merge pull request #6605 from MetaMask/Version-6.5.1v6.5.1Dan Finlay2019-05-152-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Version 6.5.1
| * | | | | | | | Version 6.5.1 RC1Dan Finlay2019-05-152-1/+6
| | | | | | | | |
* | | | | | | | | feature: integrate gaba/ShapeShiftController (#6569)Paul Bouchon2019-05-153-188/+6
|/ / / / / / / /
* / / / / / / / Set a default value for code in _determineTransactionCategory (#6604)Dan J Miller2019-05-156-28/+272
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 #6596 from MetaMask/Version-6.5.0Thomas Huang2019-05-142-2/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Version 6.5.0
| * \ \ \ \ \ \ Merge pull request #6598 from MetaMask/Version-6.5.0-changelog-updatev6.5.0Dan Finlay2019-05-141-18/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve changelog for 6.5.0
| | * | | | | | | Improve changelog for 6.5.0Dan Miller2019-05-141-18/+7
| |/ / / / / / /
| * | | | | | | Version 6.5.0 RC1Dan Finlay2019-05-112-1/+23
| | | | | | | |
* | | | | | | | Update auto-logout to recognize idle time in background (#6593)Whymarrh Whitby2019-05-145-13/+105
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix wording of autoLogoutTimeLimitDescription * AppStateController and update auto-logout functionality
* | | | | | | Merge pull request #6568 from MetaMask/feature/gaba-phishing-controllerThomas Huang2019-05-116-565/+524
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | feature: integrate gaba/PhishingController
| * | | | | | | feature: integrate gaba/PhishingControllerbitpshr2019-05-096-565/+524
| | | | | | | |
* | | | | | | | Fix RPC URL message key casing (#6595)Whymarrh Whitby2019-05-101-1/+1
| | | | | | | |
* | | | | | | | New settings custom rpc form (#6490)Dan J Miller2019-05-1036-68/+1028
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0979-191/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | Adds a transactionCategory to txMeta for use in UI (#6567)Dan J Miller2019-05-092-7/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adds a transactionCategory to txMeta for use in UI * Update transaction controller and tx-gas-util documentation on new code param in multiple functions.
* | | | | | | Auto logout after specific time (#6558)Chi Kei Chan2019-05-099-6/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add i18n strings * Finish Auto timeout * Fix linter * Fix copies * Add unit test to Advanced Tab component * Add back actions and container * Add basic test to ensure container completeness * No zero, fix linters * restrict negative in input
* | | | | | | Remove KNOWN_ADDRESS_ERROR from error objects (#6578)Chi Kei Chan2019-05-092-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove KNOWN_ADDRESS_ERROR from error objects * Update test comments
* | | | | | | Merge pull request #6581 from MetaMask/bump/eth-json-rpc-filterskumavis2019-05-092-149/+323
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Bump eth-json-rpc-filters and eth-contract-metadata
| * | | | | | | Bump eth-json-rpc-filters and eth-contract-metadataThomas2019-05-092-149/+323
|/ / / / / / /
* | | | | | | Merge pull request #6577 from MetaMask/fix-integration-testsThomas Huang2019-05-0810-13/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix integration tests: completedUiMigration state and fetch + ethquery mocking
| * | | | | | | Prevent completedUiMigration popup from appearing in integration tests.Dan Miller2019-05-086-6/+12
| | | | | | | |
| * | | | | | | Fix fetch and ethquery mocks in integration testsDan Miller2019-05-084-7/+31
| | | | | | | |
* | | | | | | | Merge pull request #6575 from whymarrh/fix-nock-unit-testsThomas Huang2019-05-083-10/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix nock usages in unit tests
| * | | | | | | 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.
| * | | | | | | Use metricsEvent in AmountMaxButton componentWhymarrh Whitby2019-05-082-5/+15
|/ / / / / / /
* | | | | | | Allow dragging seed phrase during Confirm Seed Phrase (#6557)Chi Kei Chan2019-05-078-277/+818
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add basic drag and drop functionality * Refactor seed phrase data structure * Insert to list when drop * Save before refactor * Finish DND * Fix linter * update package-lock.json * Address styling feedbacks * Add box shadow on hover * Finish adding unit tests * Remove describe.only
* | | | | | | Skip null and undefined keys when translating via context (#6543)Whymarrh Whitby2019-05-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * i18n: Don't translate null or undefined keys * Add JSDoc for I18nProvider#t context fn
* | | | | | | Adds NPM scripts for running a dapp, and dapp + chain, locally. (#6565)Dan J Miller2019-05-061-0/+2
| | | | | | |
* | | | | | | Add suffix to title text only when it exists (#6546)Whymarrh Whitby2019-05-061-1/+1
| |/ / / / / |/| | | | |
* | | | | | Refactor ProviderApprovalController to use rpc and publicConfigStore (#6410)kumavis2019-05-0417-409/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ensure home screen does not render if there are unapproved txs (#6501) * Ensure that the confirm screen renders before the home screen if there are unapproved txs. * Only render confirm screen before home screen on mount. * inpage - revert _metamask api to isEnabled isApproved isUnlocked
* | | | | | Merge pull request #6545 from whymarrh/tOrKey-ConfirmTransactionBaseThomas Huang2019-05-022-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use tOrKey for actionKey in ConfirmTransactionBase
| * | | | | | Use tOrKey for actionKey in ConfirmTransactionBaseWhymarrh Whitby2019-05-011-1/+3
| | | | | | |
| * | | | | | Fix binding of this for I18nProvider#tOrKeyWhymarrh Whitby2019-05-011-1/+1
|/ / / / / /
* | | | | | Include token checksum address in prices lookup for token rates (#6526)Thomas Huang2019-05-011-1/+3
| | | | | |
* | | | | | Send metrics event from backend for on chain transaction failures (#6500)Dan J Miller2019-04-296-5/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Send metrics event from backend for on chain transaction failures * Passes state object to backEndMetaMetricsEvent, and adds getMetaMetricState selector
* | | | | | Add subheader to all settings subviews (#6502)Chi Kei Chan2019-04-292-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add subheader to all settings subviews * add margin right to subheader
* | | | | | Ensure home screen does not render if there are unapproved txs (#6501)Dan J Miller2019-04-272-8/+18
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | * Ensure that the confirm screen renders before the home screen if there are unapproved txs. * Only render confirm screen before home screen on mount.
* | | | | Merge pull request #6522 from MetaMask/Version-6.4.1Dan Finlay2019-04-272-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Version 6.4.1 RC1
| * | | | | Version 6.4.1 RC1v6.4.1Dan Finlay2019-04-272-1/+5
|/ / / / /
* | | | | Merge pull request #6521 from MetaMask/revert-6435-4byte-registry-fallbackDan Finlay2019-04-272-28/+4
|\ \ \ \ \ | | | | | | | | | | | | Revert "Adds 4byte registry fallback to getMethodData()"
| * | | | | Revert "Adds 4byte registry fallback to getMethodData() (#6435)"Thomas Huang2019-04-272-28/+4
|/ / / / / | | | | | | | | | | | | | | | This reverts commit 09f2a2a5476c4c119c7294f496f6590156d8d07a.
* | | | | Always show private network when RPC is not whitelisted (#6495)Chi Kei Chan2019-04-261-4/+1
| | | | |
* | | | | Fix button colors on mobile (#6493)Chi Kei Chan2019-04-251-0/+3
| | | | |
* | | | | Set max-width on network dropdown and ellipsis long network name (#6494)Chi Kei Chan2019-04-252-2/+22
| | | | |
* | | | | add link to design systemChristian2019-04-251-0/+5
| |_|_|/ |/| | | | | | | Adding a direct link to the WIP design system file we're building using figma.
* | | | Opens the original webpage from where installation of MetaMask was re… (#6272)Sneh Koul2019-04-252-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Opens the original webpage from where installation of MetaMask was requested * Asking for dynamic permissions * code for forwarder/without extra permissions * Lint fix for onboardingComplete message sending code.
* | | | Merge pull request #6471 from MetaMask/Version-6.4.0Thomas Huang2019-04-192-2/+28
|\ \ \ \ | | | | | | | | | | Version 6.4.0
| * | | | Version 6.4.0 RC1Dan Finlay2019-04-182-2/+28
|/ / / /
* | | | Merge pull request #6481 from MetaMask/address-prop-types-errorsThomas Huang2019-04-183-3/+4
|\ \ \ \ | | | | | | | | | | Address prop types errors
| * | | | Ensure future tokens add decimals as numbers while supporting numbers and ↵Dan Miller2019-04-182-2/+2
| | | | | | | | | | | | | | | | | | | | strings in send-asset-row
| * | | | getSeletedAsset to only return symbol strings, not token objectsDan Miller2019-04-181-1/+2
| | | | |
* | | | | Make height consistent on all row in send-content (#6480)Chi Kei Chan2019-04-186-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update all send-content row to 54px height * Remove header subtitle * Remove tests that check for send screen subheader
* | | | | Merge pull request #6477 from MetaMask/metrics-screen-button-typeThomas Huang2019-04-181-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Update button type on metrics opt-in screen.
| * | | | Update button type on metrics opt-in screen.Dan Miller2019-04-182-2/+2
| | | | |
* | | | | Merge pull request #6475 from chikeichan/send-assetThomas Huang2019-04-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix PropTypes validation in send-asset-row
| * | | | | Fix PropTypes validation in send-asset-rowChi Kei Chan2019-04-181-1/+1
| | | | | |
* | | | | | Update confirm to use btn-primary (#6473)Chi Kei Chan2019-04-182-6/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update confirm to use btn-primary * Remove console * Fix e2e test
* | | | | Add token selection to the send screen (#6445)Chi Kei Chan2019-04-18137-134/+444
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | | | | Merge pull request #6470 from MetaMask/bdresser-patch-1-2Whymarrh Whitby2019-04-181-0/+7
|\ \ \ \ \ | | | | | | | | | | | | update publishing.md with dev diagram
| * | | | | update publishing.md with dev diagrambobby dresser2019-04-181-0/+7
| | | | | |
* | | | | | Update to eth-method-registry@1.2.0 (#6403)Dan J Miller2019-04-182-4/+4
| |/ / / / |/| | | |
* | | | | Merge pull request #6468 from chikeichan/network-indicator-style-fixThomas Huang2019-04-182-11/+24
|\ \ \ \ \ | | | | | | | | | | | | Fix switcher height when Custom RPC is selected or loading
| * | | | | Fix switcher height when Custom RPC is selected or when network is loadingChi Kei Chan2019-04-172-11/+24
| |/ / / /
* / / / / feature: add Goerli support (#6459)Paul Bouchon2019-04-1827-18/+136
|/ / / /
* | | | Merge pull request #6444 from MetaMask/localhost-network-dropdownThomas Huang2019-04-176-3/+14
|\ \ \ \ | | | | | | | | | | Fixes #6321 & #6421 - Add Localhost 8545 for network dropdown names
| * | | | Set rpcTarget, nickname, and ticker when selecting one of the default networksThomas Huang2019-04-171-2/+2
| | | | |
| * | | | Add Localhost 8545 for network dropdown namesThomas Huang2019-04-115-1/+12
| | | | |
* | | | | Adds 4byte registry fallback to getMethodData() (#6435)Dan J Miller2019-04-172-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Get contract method data from 4byte if we can't get it from eth-method-registry * Clarify token method name fallback code in getMethodData * Bugfix: don't attempt to translate falsy actionKeys in confirm-transaction-base.component.js * Rewrite getMethodFrom4Byte with async-await * Call four byte and method-registry requests in parallel in getMethodData()
* | | | | Update buttons & colors to match design system (#6446)Chi Kei Chan2019-04-1751-401/+391
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-176-0/+724
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | | | | Merge pull request #6454 from MetaMask/bump-contract-metadataWhymarrh Whitby2019-04-132-13/+86
|\ \ \ \ \ | | | | | | | | | | | | Bump eth-contract-metadata
| * | | | | bump contract metadataEsteban Mino2019-04-132-13/+86
|/ / / / /
* | | | | Merge pull request #6448 from whymarrh/getSendToAccountsWhymarrh Whitby2019-04-131-3/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove unneeded array cloning in getSendToAccounts selector
| * | | | | Remove unneeded array cloning in getSendToAccounts selectorWhymarrh Whitby2019-04-121-3/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of `Object.entries` here to map the accounts into a new array effectively produces a shallow clone of the array without guaranteeing the order of the original array (as object iteration order is implementation-specific and variable). From MDN [1]: > The **`Object.entries()`** method returns an array of a given object's own enumerable > string-keyed property `[key, value]` pairs, in the same order as that provided by a > `for...in` loop And also: > The ordering of the properties is the same as that given by looping over the > property values of the object manually. Both of which suggest that the iteration order is the same as `for...in`, which is to say that it's not specified. [2] [3] This changeset removes the cloning, keeping the shallow clone created the line before which preserves the order of the items in the array. [1]:https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/entries [2]:https://stackoverflow.com/a/5525820/1267663 [3]:https://stackoverflow.com/a/30919039/1267663
* | | | | repeated getSelectedAddress() func send.selectors.js removed (#6056)Sneh Koul2019-04-124-18/+9
| | | | |
* | | | | Added Chrome limited site access solution doc (#6422)Etienne Dusseault2019-04-111-0/+5
| | | | |
* | | | | feature: switch token pricing to CoinGecko API (#6424)Paul Bouchon2019-04-111-8/+8
|/ / / /
* | | | Merge pull request #6428 from MetaMask/sharefile.comThomas Huang2019-04-101-0/+1
|\ \ \ \ | | | | | | | | | | Don't inject web3 on sharefile.com
| * | | | Don't inject web3 on sharefile.comWhymarrh Whitby2019-04-101-0/+1
|/ / / /
* | | | Merge pull request #6417 from MetaMask/metrics-updatesWhymarrh Whitby2019-04-099-14/+56
|\ \ \ \ | | | | | | | | | | Metrics updates
| * | | | Only pass english function names to functionType metricDan Miller2019-04-093-13/+13
| | | | |
| * | | | Distinguish between token and eth selected in home screen send button ↵Dan Miller2019-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | metrics event.
| * | | | Metrics tracking gas changed - slow, average, fast, custom - on edit screen.-Dan Miller2019-04-084-0/+24
| | | | |
| * | | | Track seed phrase validation errors with MetaMetricsDan Miller2019-04-051-0/+18
| | | | |
* | | | | Merge pull request #6420 from bbondy/patch-2Thomas Huang2019-04-091-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix links to MetamaskInpageProvider in porting_to_new_environment.md
| * | | | Update porting_to_new_environment.mdBrian R. Bondy2019-04-091-2/+2
|/ / / / | | | | | | | | This MetamaskInpageProvider file was moved out into its own repo, this updates the link to point to that repo.
* | | | Version 6.3.2 (#6418)Dan J Miller2019-04-092-1/+7
| | | |
* | | | Merge pull request #6362 from MetaMask/metamaskbot-comment-contentkumavis2019-04-051-14/+2
|\ \ \ \ | | | | | | | | | | Remove broken image walkthrough from metamaskbot comment
| * | | | Remove broken image walkthrough from metamaskbot commentWhymarrh Whitby2019-03-291-14/+2
| | | | |
* | | | | Merge pull request #6401 from MetaMask/provider-error-fixkumavis2019-04-052-18/+2
|\ \ \ \ \ | |_|/ / / |/| | | | metamask-controller - use improved provider-as-middleware utility
| * | | | metamask-controller - use improved provider-as-middleware utilitykumavis2019-04-042-18/+2
| | | | |
generated by cgit (git 2.34.1) at 2024-10-17 02:57:58 +0800