aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | 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
| | | |
| * | | lib - nodeify - correctly wrap synchronous functionskumavis2019-03-292-7/+57
| | | |
| * | | notices - markAllNoticesRead - use async/awaitkumavis2019-03-294-25/+16
| | | |
| * | | Merge branch 'develop' into clearNoticeskumavis2019-03-291009-38167/+38369
| |\| |
| * | | Remove exclusive testThomas Huang2019-03-211-1/+1
| | | |
| * | | Clear notices when setCompletedOnboarding is calledThomas Huang2019-03-215-4/+85
| | | |
* | | | Merge pull request #6372 from MetaMask/addAddressIfNewkumavis2019-03-292-2/+5
|\ \ \ \ | | | | | | | | | | prevent add duplicates when address is not new
| * | | | send-footer.utils.js - addressIsNew - improve readabilitykumavis2019-03-291-1/+3
| | | | |
| * | | | prevent add duplicates when address is not newJenny Pollack2019-03-292-2/+3
| | |/ / | |/| |
* | | | Merge pull request #5575 from vimalsagar/developkumavis2019-03-2924-17/+240
|\ \ \ \ | |/ / / |/| | | Adding CoinSwitch exchange
| * | | buy-eth-url - lint fixkumavis2019-03-291-1/+1
| | | |
| * | | buy-eth-url - fix variable namekumavis2019-03-291-2/+2
| | | |
| * | | Merge branch 'develop' of https://github.com/vimalsagar/metamask-extension ↵kumavis2019-03-2924-17/+240
|/| | | | | | | | | | | | | | | into vimalsagar-develop
| * | | depoit-ether-modal - make buyEth args more explicitkumavis2019-03-291-2/+2
| | | |
| * | | getBuyEthUrl - getDefaultServiceForNetwork then switch on servicekumavis2019-03-291-23/+29
| | | |
| * | | PR 5575 review comment fixesVimal2019-02-282-24/+25
| | | |
| * | | merging upstream branchVimal2018-11-12254-10828/+19266
| |\ \ \
| * | | | Adding CoinSwitch exchangeVimal2018-10-2224-1/+215
| | | | |
* | | | | Delete some unused components (#6278)Dan J Miller2019-03-280-0/+0
| | | | |
* | | | | Merge pull request #6358 from MetaMask/dont-assume-tx-has-gas-data-in-listThomas Huang2019-03-281-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Gracefully handle null/undefined in a couple methods that operate on hex values
| * | | | | Defaults to the args list in increaseLastGasPrice and getHexGasTotalDan Miller2019-03-281-4/+4
| | | | | |
| * | | | | getHexGasTotal and increaseLastGasPrice now gracefully handle null and ↵Dan Miller2019-03-281-2/+2
|/ / / / / | | | | | | | | | | | | | | | undefined values
* | | | | Open retore-vault route from popup (#6353)Chi Kei Chan2019-03-271-1/+1
| | | | |
* | | | | Version 6.3.0 (#6350)v6.3.0Dan J Miller2019-03-272-1/+16
| | | | |
* | | | | enable privacy mode for first time users (#6347)Thomas Huang2019-03-261-1/+3
| | | | |
* | | | | Don't include tx value in calculation of balance sufficiency for cancel ↵Dan J Miller2019-03-261-2/+2
| | | | | | | | | | | | | | | | | | | | button disabling. (#6346)
* | | | | E2E - Dont close window notifications (#6349)Thomas Huang2019-03-261-2/+0
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | * Dont close window notifications * Remove commented out lines in beta spec
* | | | Cancel error rebased (#6341)Dan J Miller2019-03-264-16/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Check balance before showing cancel * Fix linter * Use existing helper methods for calculating increased cancel price * Add tooltip for disabled button * Lint fix for cancelError branch. * Disabling of cancel button should account for value of tx.
* | | | Close transaction on close of notification window (#6340)Dan J Miller2019-03-263-33/+88
| | | |
* | | | New settings page rebased (#6333)Dan J Miller2019-03-2619-581/+1010
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * New setting tab * Add InfoTab * Add Advanced tab * Add Security Tab * Finish mobile view * Make new setting page responsive * Fix linter * Fix y scrolling * Update link in network dropdown * Fix e2e tests * Remove duplicate translation key * Resolve merge conflict * Only change settings header in popup view. * Place mobile-sync button in advanced-tab of settings
* | | | Replaces the coinbase link in the deposit modal with one for wyre (#6302)Dan J Miller2019-03-225-17/+30
| | | |
* | | | Fix oversized loading overlay on gas customization modal. (#6326)Dan J Miller2019-03-221-0/+4
| | | |
* | | | Fix gas fee in the submitted step of the transaction details activity log. ↵Dan J Miller2019-03-221-2/+11
| | | | | | | | | | | | | | | | (#6301)
* | | | Hide gas price chart and prevent api call when not on ethereum networks. (#6300)Dan J Miller2019-03-2210-25/+76
| | | | | | | | | | | | Add missing translations in gas customization modal
* | | | Folder restructure (#6304)Chi Kei Chan2019-03-22984-37646/+37215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove ui/app/keychains/ * Remove ui/app/img/ (unused images) * Move conversion-util to helpers/utils/ * Move token-util to helpers/utils/ * Move /helpers/*.js inside /helpers/utils/ * Move util tests inside /helpers/utils/ * Renameand move confirm-transaction/util.js to helpers/utils/ * Move higher-order-components to helpers/higher-order-components/ * Move infura-conversion.json to helpers/constants/ * Move all utility functions to helpers/utils/ * Move pages directory to top-level * Move all constants to helpers/constants/ * Move metametrics inside helpers/ * Move app and root inside pages/ * Move routes inside helpers/ * Re-organize ducks/ * Move reducers to ducks/ * Move selectors inside selectors/ * Move test out of test folder * Move action, reducer, store inside store/ * Move ui components inside ui/ * Move UI components inside ui/ * Move connected components inside components/app/ * Move i18n-helper inside helpers/ * Fix unit tests * Fix unit test * Move pages components * Rename routes component * Move reducers to ducks/index * Fix bad path in unit test
* | | | Enable mobile sync (#6332)Bruno Barbieri2019-03-223-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * enable mobile sync * remove mobile sync as a preference * Fix typo
* | | | Stop reloading dapps on network change allowing dapps to decide if it should ↵Josh Stevens2019-03-222-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refresh or not (#6330) * feat: `inpageProvider.autoRefreshOnNetworkChange` to allow dapps to control if it refreshes or not * feat: check the `autoRefreshOnNetworkChange` before a refresh * fix linting error * fix: use `window.ethereum` now `web3.ethereum`
* | | | Fixing spelling of Ethereum in MetaMetrics copy (#6329)fixanoid2019-03-212-2/+2
| |_|/ |/| |
* | | Merge pull request #6327 from MetaMask/eth-contract-metadataWhymarrh Whitby2019-03-212-376/+153
|\ \ \ | | | | | | | | Update eth-contract-metadata dependency and sub-dependencies
| * | | Bump gaba version to avoid broken eth-contract-metadataWhymarrh Whitby2019-03-212-376/+153
|/ / /
* | | Add rollback script, move auto-changelog script (#6252)Dan Finlay2019-03-204-5/+41
| | |
* | | Fix typos in English messages (#6317)Thomas Huang2019-03-191-2/+2
| | |
* | | Fixes popups not showing when screen size is odd (#6312)William Monti Souza2019-03-181-2/+2
| | |
* | | Centre the notification in the current window (#6307)Whymarrh Whitby2019-03-151-4/+3
| | |
* | | Merge pull request #6298 from whymarrh/node-8.15.1Whymarrh Whitby2019-03-132-18/+18
|\ \ \ | | | | | | | | Node 8.15.x
| * | | ci: Skip updating npm@6 as it is defaultWhymarrh Whitby2019-03-131-2/+2
| | | |
| * | | Update Node minor versionWhymarrh Whitby2019-03-132-16/+16
| | | |
* | | | Merge pull request #6213 from whymarrh/seed-phrase-newlineWhymarrh Whitby2019-03-131-1/+1
|\ \ \ \ | |/ / / |/| | | Allow seed phrases with a trailing newline
| * | | Allow seed phrases with a trailing newlineWhymarrh Whitby2019-03-131-1/+1
|/ / /
* | | Patch/bump version (#6294)v6.2.2Thomas Huang2019-03-132-2/+9
| | |
* | | Merge pull request #6281 from MetaMask/fix-browser-back-on-reveal-seedThomas Huang2019-03-131-2/+2
|\ \ \ | | | | | | | | Fixes the use of the browser back button on the reveal seed screen
| * | | Fixes the use of the browser back button on the reveal seed screenDan Miller2019-03-121-2/+2
| | | |
* | | | Merge pull request #6292 from whymarrh/npm-cikumavis2019-03-121-8/+1
|\ \ \ \ | | | | | | | | | | Use npm ci for fast(er) installs on CI
| * | | | ci: Use npm ci for fast(er) installsWhymarrh Whitby2019-03-121-8/+1
| | | | |
* | | | | build - babel - move config to babelrc (#6284)kumavis2019-03-122-26/+23
| | | | |
* | | | | Merge pull request #6271 from whymarrh/centre-notificatonskumavis2019-03-121-5/+10
|\ \ \ \ \ | |/ / / / |/| | | | Centre all notification popups
| * | | | Centre all notification popupsWhymarrh Whitby2019-03-121-5/+10
| | | | |
* | | | | Improve Korean translations (#6268)bowbowbow2019-03-121-29/+350
| | | | |
* | | | | ui - add missing PropTypes (#6287)kumavis2019-03-122-0/+3
|/ / / /
* | | | circleci - disable npm dep cache (#6288)kumavis2019-03-121-7/+7
| | | |
* | | | mascara - remove from project (#6283)kumavis2019-03-1233-726/+24
| | | |
* | | | Merge pull request #6289 from whymarrh/fix-ci-depskumavis2019-03-122-448/+1224
|\ \ \ \ | | | | | | | | | | Allow npm to update package-lock.json file
| * | | | npm i -D ganache-core@2.5.3Whymarrh Whitby2019-03-122-368/+984
| | | | |
| * | | | Allow npm to update the package-lock.json fileWhymarrh Whitby2019-03-121-90/+250
|/ / / /
* | | | ci: Use cache version from circle environment var (#6286)kumavis2019-03-121-2/+2
| | | |
* | | | GABA: Integrate AddressBookController (#5847)Paul Bouchon2019-03-126-221/+532
| | | | | | | | | | | | | | | | | | | | | | | | * gaba: integrate AddressBookController * pin gaba version and update lockfile
* | | | Merge pull request #6279 from MetaMask/notification-windowThomas Huang2019-03-121-1/+1
|\ \ \ \ | | | | | | | | | | Nonmultiple notifications for batch txs
| * | | | Nonmultiple notifications for batch txsThomas Huang2019-03-121-1/+1
| | | | |
* | | | | Merge pull request #6280 from MetaMask/network-checksum-disableThomas Huang2019-03-121-2/+1
|\ \ \ \ \ | | | | | | | | | | | | No longer check network when validating checksum addresses
| * | | | | Remove line rather than comment outThomas Huang2019-03-121-4/+0
| | | | | |
| * | | | | No longer check network when validating checksum addressesThomas Huang2019-03-121-2/+5
| | | | | |
* | | | | | Version 6.2.1 (#6251)Thomas Huang2019-03-122-1/+3
|/ / / / /
* | / / / development - enhancement for sourcemap validator tool (#6277)kumavis2019-03-121-22/+71
| |/ / / |/| | |
* | | | Merge pull request #6261 from Pedro-vk/patch-1Thomas Huang2019-03-081-18/+18
|\ \ \ \ | |/ / / |/| | | Uppercase and context fixes on Spanish translation.
| * | | Uppercase and context fixes on Spanish translation.Pedro Gutiérrez2019-03-071-18/+18
|/ / /
* | | Handle undefined gas limits and prices in transaction-breakdown.component ↵Dan J Miller2019-03-072-21/+38
| | | | | | | | | | | | (#6246)
* | | Add privacy policy link to modal metrics opt-in (#6250)Dan J Miller2019-03-071-1/+7
| | |
* | | Prevent advanced gas input arrows from setting value to < 0 (#6248)Dan J Miller2019-03-072-4/+24
| | |
* | | Only call onRecipient and onSender methods if defined in sender-to-recipient ↵Dan J Miller2019-03-071-2/+6
| | | | | | | | | | | | (#6247)
* | | Fix missing this reference in addtoken button onclick method (#6245)Dan J Miller2019-03-061-1/+2
| | |
* | | Fixes the 'Percentages row tracks and gutters' decpracation warning. (#6244)Dan J Miller2019-03-061-1/+1
| | |
* | | Version 6.2.0 (#6239)v6.2.0Dan J Miller2019-03-062-1/+7
| | | | | | | | | | | | | | | | | | * Version 6.2.0 RC1 * Update changelog.md for 6.2.0
* | | Metametrics fixes (#6238)Dan J Miller2019-03-066-38/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improve opt-in opt-out event tracking after going 'back' in onboarding. * Fix 'Switched Networks' metrics event. * Fix custom variables ids (can only use ids 1-5) * Fix tracking of function type custom variable for metametrics in confirm-transaction-base * Add missing metametrics events
* | | Merge pull request #6237 from MetaMask/metrics-descriptionThomas Huang2019-03-062-2/+2
|\ \ \ | | | | | | | | Metrics description
| * | | Wrap in spanThomas Huang2019-03-061-1/+1
| | | |
| * | | Fix typoThomas Huang2019-03-061-1/+1
|/ / /
* | | Fix MetaMetrics Environment Check (#6235)Dan J Miller2019-03-061-1/+1
| | |
* | | Metametrics (#6171)Dan J Miller2019-03-0594-162/+2203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add metametrics provider and util. * Add backend api and state for participating in metametrics. * Add frontend action for participating in metametrics. * Add metametrics opt-in screen. * Add metametrics events to first time flow. * Add metametrics events for route changes * Add metametrics events for send and confirm screens * Add metametrics events to dropdowns, transactions, log in and out, settings, sig requests and main screen * Ensures each log in is measured as a new visit by metametrics. * Ensure metametrics is called with an empty string for dimensions params if specified * Adds opt in metametrics modal after unlock for existing users * Adds settings page toggle for opting in and out of MetaMetrics * Switch metametrics dimensions to page level scope * Lint, test and translation fixes for metametrics. * Update design for metametrics opt-in screen * Complete responsive styling of metametrics-opt-in modal * Use new chart image on metrics opt in screens * Incorporate the metametrics opt-in screen into the new onboarding flow * Update e2e tests to accomodate metametrics changes * Mock out metametrics network requests in integration tests * Fix tx-list integration test to support metametrics provider. * Send number of tokens and accounts data with every metametrics event. * Update metametrics event descriptor schema and add new events. * Fix import tos bug and send gas button bug due to metametrics changes. * Various small fixes on the metametrics branch. * Add origin custom variable type to metametrics.util * Fix names of onboarding complete actions (metametrics). * Fix names of Metrics Options actions (metametrics). * Clean up code related to metametrics. * Fix bad merge conflict resolution and improve promise handling in sendMetaMetrics event and confrim tx base * Don't send a second metrics event if user has gone back during first time flow. * Collect metametrics on going back from onboarding create/import. * Add missing custom variable constants for metametrics * Fix metametrics provider * Make height of opt-in modal responsive. * Adjust text content for opt-in modal. * Update metametrics event names and clean up code in opt-in-modal * Put phishing warning step next to last in onboarding flow * Link terms of service on create and import screens of first time flow * Add subtext to options on the onboarding select action screen. * Fix styling of bullet points on end of onboarding screen. * Combine phishing warning and congratulations screens. * Fix placement of users if unlocking after an incomplete onboarding import flow. * Fix capitalization in opt-in screen * Fix last onboarding screen translations * Add link to 'Learn More' on the last screen of onboarding * Code clean up: metametrics branch * Update e2e tests for phishing warning step removal * e2e tests passing on metametrics branch * Different tracking urls for metametrics on development and prod
* | | Merge pull request #6223 from MetaMask/fix-6221Thomas Huang2019-03-051-1/+1
|\ \ \ | | | | | | | | Show popup if notification or activeMMtab is true
| * | | SimplifyThomas Huang2019-03-051-1/+1
| | | |
| * | | ImprovementThomas Huang2019-03-011-1/+1
| | | |
| * | | Show popup if notification or activeMMtab is true but not if popup is openThomas Huang2019-03-011-1/+1
| | | |
* | | | bump trezor-connect to v7 (#6224)Bruno Barbieri2019-03-052-37/+46
|/ / /
* | | First time flow updates (#6192)Dan J Miller2019-02-2741-528/+763
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Action select step of onboarding flow added. * Update navigation on create and import password screens. * Adds terms of service checkbox to create and import account screens. * Add security warning to jazzicon intro step * Update and streamline unique image to confirm seed steps of first time flow. * UI touch ups to welcome screen. * UI touch up on select action page * Fix first time import flow. * Add end of flow screen to first time flow * Replace unique image screen with updated fishing warning screen. * Update e2e tests for onboarding flow changes. * Add required translations to onboarding flow. * Update design of select action screen to emphasize create new wallet option. * Clean up onboarding flow code. * Remove notice related code from first-time-flow directory. * Use updater function argument in new-account.component
* | | Show/Hide Fiat on Testnets based on User Preference (#6153)Chi Kei Chan2019-02-2739-113/+1169
| | |
* | | Merge pull request #6190 from whymarrh/tmp.RvdXXs4ikumavis2019-02-261-1/+0
|\ \ \ | | | | | | | | Remove public property from package.json file
| * | | Remove public property from package.json fileWhymarrh Whitby2019-02-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per the package.json documentation [1] setting `"private": true` in the package.json file is enough for npm to refuse to publish it. The docs don't specify that a `public` key is respected. [1]:https://docs.npmjs.com/files/package.json#private
* | | | Feature Flag + Mobile Sync (#5955)Dan Finlay2019-02-2618-78/+760
| | | |
* | | | Fix gas estimation when sending to contracts (#6195)Dan J Miller2019-02-266-8/+16
| | | | | | | | | | | | | | | | | | | | * Fix gas estimation when sending to contracts * Fix calculating of balance sufficiency and tx params when sending token transaction
* | | | Merge pull request #6166 from whymarrh/bye-bye-old-uiWhymarrh Whitby2019-02-21127-20282/+12
|\ \ \ \ | | | | | | | | | | Delete the old UI
| * | | | Remove unused CI jobs, rename e2e beta jobsWhymarrh Whitby2019-02-212-16/+12
| | | | |
| * | | | Remove outdated ui dev and ui mock docsWhymarrh Whitby2019-02-214-18/+0
| | | | |
| * | | | Delete old-ui folderWhymarrh Whitby2019-02-21121-20248/+0
| |/ / /
* / / / account tracker - update accounts from balanceChecker contract (#6181)Jenny Pollack2019-02-213-3/+70
|/ / / | | | | | | | | | | | | | | | * account tracker - update accounts from balanceChecker contract * fall back to getBalance if the contract query fails
* | | Disable npm audit (#6188)Thomas Huang2019-02-211-13/+13
| | |
* | | fix: update README to add a missing " " space (#6191)Alon Bukai2019-02-211-1/+1
| | |
* | | EIP-1193: standard provider API (#6170)Paul Bouchon2019-02-209-23/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EIP-1193: Implement new provider API * EIP-1193: Updated implementation * Remove test file * Fix tests * Update ping check * Update logic * PR feedback
* | | Merge pull request #6184 from chikeichan/6132Dan J Miller2019-02-202-1/+26
|\ \ \ | | | | | | | | turn camcelCase method name to space separated
| * | | turn camcelCase method name to space separatedChi Kei Chan2019-02-192-1/+26
| | | |
* | | | Merge pull request #6185 from chikeichan/5681Dan J Miller2019-02-201-5/+0
|\ \ \ \ | | | | | | | | | | Remove password check when importing Account JSON
| * | | | Remove password check when importing Account JSONChi Kei Chan2019-02-191-5/+0
| |/ / /
* | | | Merge pull request #6183 from chikeichan/5171Dan J Miller2019-02-201-1/+1
|\ \ \ \ | | | | | | | | | | Bring Popup to front when ui is tiggered
| * | | | Bring Popup to front when ui is tiggeredChi Kei Chan2019-02-191-1/+1
| |/ / /
* | | | Merge pull request #6187 from MetaMask/Version-6.1.0Thomas Huang2019-02-204-1/+56
|\ \ \ \ | | | | | | | | | | Version 6.1.0
| * | | | Add sensitive publishing protocolv6.1.0Dan Finlay2019-02-202-0/+47
| | | | |
| * | | | Version 6.1.0 RC1Dan Finlay2019-02-202-1/+9
|/ / / /
* / / / Change "Token Address" to "Token Contract Address" (#6182)Chi Kei Chan2019-02-202-1/+4
|/ / /
* | | Fix inpage.js event handler memory leak (#6177)Graham Kaemmer2019-02-191-4/+5
| | | | | | | | | Fixes #6176
* | | Add Copy Tx ID button to transaction-list-item-details (#6146)Chi Kei Chan2019-02-174-2/+42
| | | | | | | | | | | | | | | | | | * Add Copy Tx ID button to transaction-list-item-details * Move justCopied toggle timeout inside setState callback
* | | Merge pull request #6164 from whymarrh/delete-travis-configWhymarrh Whitby2019-02-151-13/+0
|\ \ \ | | | | | | | | Delete unused Travis CI config
| * | | Delete unused Travis CI configWhymarrh Whitby2019-02-151-13/+0
|/ / /
* | | Merge pull request #6137 from whymarrh/es6-backgroundWhymarrh Whitby2019-02-148-32/+32
|\ \ \ | | | | | | | | Sprinkle ES6 onto background files
| * | | Update popup-core script to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-6/+6
| | | |
| * | | Update platforms/extension to use ES6 destructuring requiresWhymarrh Whitby2019-02-121-1/+1
| | | |
| * | | Update phishing-detect script to use ES6 destructuring requiresWhymarrh Whitby2019-02-121-1/+1
| | | |
| * | | Update NoticesController to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-3/+3
| | | |
| * | | Update MetaMaskController to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-5/+5
| | | |
| * | | Fix all "var used instead of let or const" problems in inpage.jsWhymarrh Whitby2019-02-121-4/+4
| | | |