aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump eth-ledger-bridge-keyring from 0.2.0 to 0.2.1dependabot/npm_and_yarn/eth-ledger-bridge-keyring-0.2.1dependabot[bot]2020-03-242-125/+288
| | | | | | | Bumps [eth-ledger-bridge-keyring](https://github.com/MetaMask/eth-ledger-bridge-keyring) from 0.2.0 to 0.2.1. - [Release notes](https://github.com/MetaMask/eth-ledger-bridge-keyring/releases) - [Commits](https://github.com/MetaMask/eth-ledger-bridge-keyring/commits) Signed-off-by: dependabot[bot] <support@github.com>
* version bumpChen Wei2019-09-222-1/+3
|
* add mainnetChen Wei2019-09-228-3/+75
|
* bump version to 6.8.2Chen Wei2019-09-162-1/+3
|
* update privacy & terms linkChen Wei2019-09-166-42/+52
|
* address all the critical / serious audit issuesChen Wei2019-09-102-4765/+4415
|
* Revert "fix npm audit"Chen Wei2019-09-102-2089/+2190
| | | | This reverts commit 233b8030f1c5eac719156e089ac54d24d9f3d924.
* fix npm auditChen Wei2019-09-102-2190/+2089
|
* use rpcUrl from network config when estimating gasChen Wei2019-09-092-3/+13
|
* bump versionChen Wei2019-09-062-1/+3
|
* do not base64 encode "inpage.js"Chen Wei2019-09-062-1305/+3462
|
* update some logosChen Wei2019-09-0612-79/+312
|
* bump versionChen Wei2019-07-182-1/+3
|
* this will work on FFChen Wei2019-07-181-1/+1
|
* do not load inpage.js by "fs". They can be accessed with extension URLChen Wei2019-07-182-37/+9
|
* 1. rename stream target name 2. do not expose web3Chen Wei2019-07-183-24/+24
|
* bump versionChen Wei2019-07-082-1/+3
|
* force update gasChen Wei2019-07-082-6/+20
|
* update html titleChen Wei2019-07-056-6/+6
|
* make it work on FFChen Wei2019-07-041-2/+3
|
* update manifestChen Wei2019-07-041-3/+3
|
* version bumpChen Wei2019-07-042-1/+3
|
* update wordingChen Wei2019-07-041-1/+1
|
* update extension notificationChen Wei2019-07-041-3/+5
|
* replace some wordingsChen Wei2019-07-043-18/+17
|
* it seems safer to have workaround in UI layer instead of changing the ↵Chen Wei2019-07-036-24/+10
| | | | constants or logic
* Revert "part of replacing 'ETH'"Chen Wei2019-07-0313-18/+38
| | | | This reverts commit dd139452d053496d79816c881dbb59ee4aded81b.
* part of replacing 'ETH'Chen Wei2019-07-0213-38/+18
|
* revert replacing "ETH" with "TAN"Chen Wei2019-07-0214-82/+64
|
* configuration, translation updatingChen Wei2019-07-0227-339/+237
|
* translation needed by extension setupChen Wei2019-07-022-4/+4
|
* part of the style refinementChen Wei2019-07-0215-109/+156
|
* dapp handler injected as "tangerine"Chen Wei2019-07-024-5/+7
|
* estimated gas should come from RPCChen Wei2019-07-014-122/+100
|
* 1. correct name display in network dropdown 2. enable 373 derived pathChen Wei2019-07-0133-620/+613
|
* be able to switch between eth and tanChen Wei2019-06-283-77/+118
|
* 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
| |
| * 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 pull request #6721 from MetaMask/Version-6.6.2Thomas Huang2019-06-1844-7122/+21293
|\ \ \ | | |/ | |/| Version 6.6.2
| * | 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 #6695 from MetaMask/developDan Finlay2019-06-075-64/+15
|\| | | | | | | | Develop to master
| * | 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 #6683 from MetaMask/developThomas Huang2019-06-0554-1660/+2579
|\| | | | | Merge dev to master
| * 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
| | | |
| | | * update packagepldespaigne2019-05-302-1/+40687
| | | |
| | | * delete package-jsonpldespaigne2019-05-301-39752/+0
| | | |
| | | * refactor & change html pagespldespaigne2019-05-055-154/+11
| | | |
| | | * add rinkeby & goerlipldespaigne2019-05-051-0/+6
| | | |
| | | * update content-hashpldespaigne2019-05-052-7551/+7580
| | | |
| | | * fix npm ci bug (version mismatch)pldespaigne2019-04-111-5/+6
| | | |
| | | * issue#5742pldespaigne2019-04-045-7798/+7795
| | | |
| | | * renaming registrar into registrypldespaigne2019-04-042-8/+8
| | | |
* | | | Merge pull request #6616 from MetaMask/developThomas Huang2019-05-164-3/+6
|\| | | | | | | | | | | Update master for 6.5.2 production release
| * | | 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 #6599 from MetaMask/developDan Finlay2019-05-15154-1337/+3403
|\| | | | | | | | | | | Master Version Bump (v6.5.0)
| * | | 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 #6523 from MetaMask/developThomas Huang2019-04-279-35/+40
|\| | | | | | | | Update master with 6.4.1 Release
| * | 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.
* | | Merge pull request #6484 from MetaMask/developDan Finlay2019-04-25233-648/+2002
|\| | | | | | | | Update master branch with develop (v6.4.0)
| * | 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.
* | | | Merge pull request #6419 from MetaMask/developThomas Huang2019-04-0942-2575/+303
|\| | | | | | | | | | | Merge develop into master
| * | | 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
| | | |/ | | |/|
| * | | Merge pull request #6406 from MetaMask/remove-user-actions-controllerJenny Pollack2019-04-051-17/+0
| |\ \ \ | | | | | | | | | | remove user actions controller
| | * | | remove user actions controllerJenny Pollack2019-03-261-17/+0
| | | | |
| * | | | doc - publishing - typo fix (#6399)kumavis2019-04-051-1/+1
| | | | |
| * | | | pin eth-contract-metadata to last commit hash (#6396)Esteban Miño2019-04-052-359/+208
| | |/ / | |/| |
| * | | Merge pull request #6397 from MetaMask/wyre-deposit-modalkumavis2019-04-041-4/+4
| |\ \ \ | | | | | | | | | | Change coinbase to wyre
| | * | | Change coinbase to wyreThomas Huang2019-04-041-4/+4
| | | | |
| * | | | bump ledger and trezor keyring (#6395)Bruno Barbieri2019-04-042-131/+195
| | | | |
| * | | | Fix display of gas chart on Ethereum networks (#6389)Dan J Miller2019-04-044-3/+7
| |/ / /
| * | | Remove NoticeController (#6382)Thomas Huang2019-04-0225-1000/+77
| | | |
| * | | Remove unused account-dropdowns components (#6363)v6.3.2Whymarrh Whitby2019-04-022-811/+0
| | | |
| * | | Remove unused mascara directory (#6360)Whymarrh Whitby2019-04-022-416/+0
|/ / /
* | | Merge pull request #6375 from MetaMask/Version-6.3.1v6.3.1Thomas Huang2019-03-304-2/+16
|\ \ \ | | | | | | | | Version 6.3.1
| * | | Version 6.3.1Dan Miller2019-03-302-1/+7
| | | |
| * | | Check token name constants against the lower case methodData name in conf tx ↵Dan Miller2019-03-301-1/+1
| | | | | | | | | | | | | | | | switch container.
| * | | Ensure correct confirm screen in case of smartcontract check failDan Miller2019-03-302-1/+9
| | | |
* | | | About tab copy changes; Update route for Info & Help in account menu (#6356)Chi Kei Chan2019-03-303-4/+10
|/ / /
* | / Revert to providing inline defaults in getHexGasTotal and ↵Dan J Miller2019-03-291-4/+4
| |/ |/| | | | | increaseLastGasPrice (#6361)
* | Further e2e fixes in wake of #6364 and #6367 (#6374)Dan J Miller2019-03-293-40/+64
| | | | | | | | | | | | | | | | * 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-298-57/+132
|\ \ | | | | | | 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
| | |
| * | ci: Add build:test Gulp task for e2e buildWhymarrh Whitby2019-03-293-4/+19
| | |
| * | 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-293-14/+15
| | |
| * | Use webRequest to cancel all requests to infura in e2e tests.Dan Miller2019-03-295-6/+78
| | |
* | | Merge pull request #6328 from MetaMask/clearNoticeskumavis2019-03-297-19/+136
|\ \ \ | | | | | | | | Clear notices
| * | | test - unit - ui - actions - setCompletedOnboarding - fix stub to call callbackkumavis2019-03-291-0/+2
| | | |
| * | | lint fixkumavis2019-03-292-2/+2
| | | |
| * | | actions - setCompletedOnboarding - make async with pifykumavis2019-03-291-24/+17
| | | |
| * | | notice-controller - make markAllNoticesRead synckumavis2019-03-292-2/+2
| | | |