aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add togglable advanced gas controls on send and confirm screens (#6112)Dan J Miller2019-02-0620-36/+609
| | | | | | | | | | | | | | | | | | | | * Extract advanced gas input controls to their own component * Add advanced inline gas toggle to settings * Add optional advanced inline gas to send send screen * Adds optional advanced gas inputs to the confirm screen * Add info modals for advanced gas inputs. * Fix translation of advance gas toggle description. * Lint and unit test fixes for inline-advanced-gas-inputs * Increase margin above advanced options button on send screen * Move methods from constructor to property syntax in advanced-gas-inputs.component
* Merge pull request #5929 from whymarrh/phishing-redesignWhymarrh Whitby2019-02-063-77/+465
|\ | | | | Update design of phishing warning screen
| * Update design of phishing warning screenWhymarrh Whitby2019-02-063-77/+465
|/
* Merge pull request #6082 from whymarrh/migrate-to-new-uiWhymarrh Whitby2019-02-0525-229/+177
|\ | | | | Migrate all users to the new UI
| * Add announcement for users migrated to the new UIWhymarrh Whitby2019-02-0515-50/+122
| |
| * Remove betaUI preference state, replace with completedUiMigrationWhymarrh Whitby2019-02-053-9/+42
| |
| * Default to the new UI for all usersWhymarrh Whitby2019-02-056-116/+13
| |
| * Remove commented references to Beta UIWhymarrh Whitby2019-02-051-18/+0
| |
| * Remove "Use old UI" settingWhymarrh Whitby2019-02-052-37/+1
|/
* Version 5.3.5 (#6109)v5.3.5Whymarrh Whitby2019-02-052-1/+5
|
* Privacy mode fixes (#6087)Bruno Barbieri2019-02-022-14/+16
| | | | | | | | | | * Version 5.3.4 RC1 * fix old ui approval screen * fix error caused by meshtesting iframe * fix linter errors
* Version 5.3.4 RC1 (#6084)Dan Finlay2019-02-012-1/+5
|
* fix - migration 30 undefinds (#6079)Frankie2019-02-011-16/+18
|
* Merge pull request #6076 from MetaMask/Version-5.3.3Thomas Huang2019-01-312-1/+8
|\ | | | | Version 5.3.3 RC1
| * Version 5.3.3 RC1v5.3.3Dan Finlay2019-01-312-1/+8
|/
* EIP-1102 updates (#6006)Paul Bouchon2019-01-318-42/+49
| | | | | | * Update privacy notice * Respond to 1102 messages using tab ID
* Remove unused InitializeMenuScreen component (#6075)Whymarrh Whitby2019-01-311-224/+0
|
* Improved Spanish translations (#6072)Pedro Gutiérrez2019-01-311-13/+13
|
* Merge pull request #6074 from MetaMask/ui-codeownersWhymarrh Whitby2019-01-301-1/+1
|\ | | | | Update UI code owners
| * Update UI codeownersWhymarrh Whitby2019-01-301-1/+1
|/
* e2e: Use close instead of save for gas modal (#6066)Thomas Huang2019-01-301-1/+2
|
* Add visual indicator when displaying a cached balance (#5854)Dan J Miller2019-01-3022-31/+161
|
* I#5956 fix2 dont overwrite existing rpc settings (#6044)Frankie2019-01-307-9/+85
| | | | | | | | | | | | | | * mm-controller - dont overwrite existing rpc settings * ui-networkDropdown - dont pass old network as chainId * add methods preferencesController.updateRpc and metamaskController.updateAndSetCustomRpc * use updateAndSetCustomRpc in settings to allow rpcs to be updated * use new rpc as nickname if no nick name has been supplied * fix update rpc method
* Version 5.3.2 RC1 (#6069)Dan Finlay2019-01-292-1/+10
|
* Merge pull request #6021 from MetaMask/i5943-shapeshift-txDan J Miller2019-01-264-50/+1028
|\ | | | | Order shapeshift transactions by time within the transactions list
| * Fix bugs in e2e tests related to gas customization inputs.Dan Miller2019-01-251-14/+17
| |
| * Add integration test for ordering of shapeshift txs in history list.Dan Miller2019-01-252-8/+227
| |
| * Fix integration testsAlexander Tseung2019-01-252-20/+756
| |
| * Order shapeshift transactions by time within the transactions listAlexander Tseung2019-01-251-12/+32
| |
* | add source for header in create infura client (#6023)Jenny Pollack2019-01-252-679/+266
|/ | | | | | * add source for header in create infura client * bump eth-json-rpc-infura
* Prevent send to token warning (#6058)Esteban Miño2019-01-2428-15/+256
|
* Refactor first time flow, remove seed phrase from state (#5994)Alexander Tseung2019-01-23114-3002/+2722
| | | | | | | | | | | | | | | | | | | | * Refactor and fix styling for first time flow. Remove seed phrase from persisted metamask state * Fix linting and tests * Fix translations, initialization notice routing * Fix drizzle tests * Fix e2e tests * Fix integration tests * Fix styling * Fix migration naming from 030 to 031 * Open extension in browser when user has not completed onboarding
* Updated Spanish translations (#6046)oliver renwick2019-01-231-3/+577
| | | | | | | * up to E's in translation, starting from about 60% incomplete * Spanish at 100% * Integrating changes as suggested by fernandomg * with updates from Herman and Esteban.
* Prevent send to token (#6051)Esteban Miño2019-01-239-3/+66
| | | | | | | | | | | | | | * check contact metadata * check for tokens in state * tests * update tests * validation only if sending tokens * container test
* fix asset detection (#6049)Bruno Barbieri2019-01-233-7/+45
|
* Use Parity on-chain registry only when is needed (#6052)Esteban Miño2019-01-237-6/+61
| | | | | | * add and use knownMethodData to avoid infura requests * dataMethod to methodData and check empty response
* Refactor BalanceComponent to jsx (#6048)Alexander Tseung2019-01-216-250/+121
|
* I#5956 fix 1 (#6026)Frankie2019-01-185-1/+93
| | | | | * prevent invalid chainId's when adding cusstom rpcs * migration 30 removes invalid chaids from preferences and networkController for custom rpcs
* Fix grammar error in Current Conversion (#6029)Alexander Tseung2019-01-172-3/+3
|
* Merge pull request #6027 from MetaMask/Version-5.3.1Thomas Huang2019-01-172-1/+14
|\ | | | | Version 5.3.1 RC2
| * Merge branch 'develop' into Version-5.3.1v5.3.1Dan Finlay2019-01-171-18/+18
| |\
| * | Version 5.3.1 RC2Dan Finlay2019-01-172-1/+14
| | |
* | | Disable account dropdown on signing screens (#6024)Alexander Tseung2019-01-175-85/+195
| |/ |/|
* | Skip drizzle tests unit issue with ci is determined (#5982)Thomas Huang2019-01-171-18/+18
|/
* Merge pull request #5966 from filips123/patch-1Thomas Huang2019-01-111-3/+180
|\ | | | | Update Slovenian translation
| * Merge branch 'develop' of https://github.com/MetaMask/metamask-extension ↵Filip Š2019-01-1017-278/+445
| |\ | | | | | | | | | into patch-1
| * | Update Slovenian translationFilip Š2018-12-261-3/+180
| | |
* | | Set auto conversion off for token/eth conversion (#6005)Thomas Huang2019-01-111-1/+1
| | |
* | | Fix confirm screen for sending ether tx with hex data (#6008)Alexander Tseung2019-01-111-0/+6
| |/ |/|
* | Merge pull request #5999 from MetaMask/app-descriptionThomas Huang2019-01-061-1/+1
|\ \ | | | | | | Refine app description
| * | Refine app descriptionDan Finlay2019-01-061-1/+1
|/ / | | | | Should help SEO on the chrome store.
* | Merge pull request #5997 from whymarrh/drizzle-scriptThomas Huang2019-01-051-9/+24
|\ \ | | | | | | Harden Drizzle test runner script
| * | Clean up drizzle test runner scriptWhymarrh Whitby2019-01-041-10/+21
| | |
| * | Revert "remove error flags from drizzle setup"Whymarrh Whitby2019-01-041-0/+4
|/ / | | | | | | This reverts commit 938f4286e49dbdf7aef5b767917ad34ec6c6bb04.
* | Fix ERC20 token value decoding (#5995)Hsuan Lee2019-01-041-1/+1
| | | | | | When MetaMask user calls non-standard ERC20 methods such as `mint`, `tokenData` will be `undefined` and an uncaught error will break the UI
* | Merge pull request #5970 from Wathis/developVincent2019-01-041-6/+6
|\ \ | | | | | | Fixed a word french translation (several occurrences of connection instead of connexion)
| * | Wrong french translationWathis2019-01-041-6/+6
|/ / | | | | Changing "Connection" by "Connexion"
* | Fix Component#componentDidUpdate usage (#5977)Bowen2019-01-041-3/+3
| |
* | Merge pull request #5987 from MetaMask/Version-5.3.0Thomas Huang2019-01-042-1/+10
|\ \ | | | | | | Version 5.3.0 RC1
| * | Version 5.3.0 RC1v5.3.0Dan Finlay2019-01-032-1/+10
| | |
* | | Merge pull request #5992 from MetaMask/i5140-accountsThomas Huang2019-01-048-255/+398
|\ \ \ | | | | | | | | Add scrolling button to account list
| * | | Add scrolling button to account listAlexander Tseung2019-01-048-255/+398
| |/ /
* | | Merge pull request #5989 from smiled0g/developThomas Huang2019-01-041-1/+1
|\ \ \ | |/ / |/| | fix typo in phishing.html title
| * | fix typo in phishing.html titlePaul Chonpimai2019-01-031-1/+1
|/ /
* | Merge pull request #5986 from MetaMask/fix-etherscan-againThomas Huang2019-01-031-1/+1
|\ \ | | | | | | Fix notifications link
| * | fix extension linkbrunobar792019-01-031-1/+1
|/ /
* | Merge pull request #5978 from MetaMask/fix-etherscan-link-notificationsBruno Barbieri2019-01-031-1/+1
|\ \ | | | | | | Fix etherscan links on notifications
| * \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792019-01-031-3/+3
| |\ \ | |/ / |/| | | | | fix-etherscan-link-notifications
* | | Merge pull request #5980 from MetaMask/fix-drizzle-testsThomas Huang2019-01-031-3/+3
|\ \ \ | |_|/ |/| | Fix drizzle tests
| * | remove --unsafe-permBruno Barbieri2019-01-031-1/+1
| | |
| * | no globalsBruno Barbieri2019-01-031-3/+3
| | |
| * | Use sudo consistentlyBruno Barbieri2019-01-031-2/+2
| | |
| * | --unsafe-perm ?Bruno Barbieri2019-01-031-1/+1
| | |
| * | Dont use sudo to install truffleBruno Barbieri2019-01-011-1/+1
|/ /
| * Fix etherscan links on notificationsBruno Barbieri2018-12-291-1/+1
|/
* Prevent users from changing the From field in the send screen (#5922)Alexander Tseung2018-12-1426-464/+1306
| | | | | | * Prevent users from changing the From field in the send screen * Fix integration tests
* Fix displayed time and date in the activity log. Remove vreme library, add ↵Alexander Tseung2018-12-147-205/+192
| | | | luxon library. (#5932)
* Disallow loading as metamaskNetworkId (#5924)Frankie2018-12-142-3/+14
| | | | | | * transactions - throw an error if a transaction is generated while the network is loading * add tests for failing when netId is loading
* Merge pull request #5893 from MetaMask/loading-network-screenDan J Miller2018-12-1415-38/+341
|\ | | | | Loading network screen
| * Clean up for the loading-network-screenDan Miller2018-12-134-33/+30
| |
| * Improve styling of loading retry / error screenDan Miller2018-12-131-0/+6
| |
| * Adds network loading retry / error screen.Dan Miller2018-12-1311-4/+268
| |
| * Add identifier of private network to the network loading screen message.Dan Miller2018-12-134-7/+23
| |
| * Add spinner and dropdown arrow to network indicator on custom network loading.Dan Miller2018-12-132-27/+47
| |
* | Merge pull request #5926 from MetaMask/Version-5.2.2Thomas Huang2018-12-132-1/+7
|\ \ | | | | | | Version 5.2.2 RC1
| * | Version 5.2.2 RC1v5.2.2Dan Finlay2018-12-132-1/+7
|/ /
* | Fix speed up button not showing for transactions with the lowest nonce (#5925)Alexander Tseung2018-12-131-3/+3
| |
* | Merge pull request #5923 from MetaMask/phishing-text-linkThomas Huang2018-12-131-2/+1
|\ \ | | | | | | Update the Phishing Warning notice text to not use inline URLs
| * | Update the Phishing Warning notice text to not use inline URLsWhymarrh Whitby2018-12-131-2/+1
| |/ | | | | This changeset makes the Phishing Warning text not have a raw link right at the end of a sentence since it could introduce possible copy-and-paste errors.
* / Make docs links consistent (#5920)Dan Finlay2018-12-132-22/+14
|/ | | | | | | | * Make docs links consistent So our various docs pages inter-link consistently per https://github.com/MetaMask/metamask-docs/issues/1 * Add docs links to internal docs page
* Merge pull request #5919 from MetaMask/gas-customization-fixesDan J Miller2018-12-1310-26/+60
|\ | | | | Fix some styling and translations in the gas customization modal
| * Show transaction fee instead of total fee in top left of gas customization ↵Dan Miller2018-12-134-9/+9
| | | | | | | | modal.
| * Fix width of gas customization model in notification viewDan Miller2018-12-132-3/+4
| |
| * Add missing translation to the gas customization component.Dan Miller2018-12-136-14/+47
| |
* | Version 5.2.1 RC1 (#5918)v5.2.1Dan J Miller2018-12-132-1/+5
|/
* Merge pull request #5917 from MetaMask/correct-gas-limit-from-external-txDan J Miller2018-12-126-11/+23
|\ | | | | Ensures that advanced tab gas limit reflects tx gas limit
| * Ensures that advanced tab gas limit reflects tx gas limitDan Miller2018-12-126-11/+23
|/
* Add submitDisabled prop to Modals. Disable submit button when creating a ↵Alexander Tseung2018-12-124-2/+44
| | | | cancel transaction (#5910)
* Merge pull request #5902 from MetaMask/i5846-ProviderCrashesThomas Huang2018-12-124-468/+1057
|\ | | | | Fix provider crashes
| * Merge pull request #5908 from MetaMask/i5846-ProviderCrashes-changelogThomas Huang2018-12-122-2/+9
| |\ | | | | | | Changelog and version bump for 5.2.0
| | * Changelog and version bump for 5.2.0Dan Miller2018-12-122-2/+9
| |/
| * Merge branch 'develop' into i5846-ProviderCrashesDan Finlay2018-12-1115-68/+395
| |\
| * | Bump package lock, mostly to https linksDan Finlay2018-12-111-465/+1047
| | |
| * | Bump json-rpc-engine to v4.0.0Dan Finlay2018-12-111-1/+1
| | |
* | | Show Failed transaction in the browser notification for on-chain failures ↵Alexander Tseung2018-12-111-4/+7
| |/ |/| | | | | (#5904)
* | Improve ux for low gas price set (#5862)Dan J Miller2018-12-1115-68/+395
|/ | | | | | | | | | * Show user warning if they set gas price below safelow minimum, error if 0. * Properly cache basic price estimate data. * Default retry price to recommended price if original price was 0x0 * Use mock fetch in send-new-ui integration tests.
* fix formatting of 32-byte strings in personal_sign (#5878)Noah Zinsmeister2018-12-102-1/+2
|
* Group transactions by nonce (#5886)Alexander Tseung2018-12-1047-373/+1208
|
* Merge pull request #5892 from MetaMask/fix-net-version-race-conditionThomas Huang2018-12-081-4/+10
|\ | | | | Fix race condition in network controller lookup() method.
| * Fix race condition in network controller lookup() method.Dan Miller2018-12-071-4/+10
| |
* | Merge pull request #5890 from whymarrh/pl-i18nWhymarrh Whitby2018-12-081-0/+9
|\ \ | | | | | | Fill in more Polish message translations
| * | Fill in more Polish message translationsWhymarrh Whitby2018-12-061-0/+9
| | |
* | | Merge pull request #5891 from whymarrh/npm-auditWhymarrh Whitby2018-12-075-2552/+2542
|\ \ \ | |/ / |/| | Migrate test deps CI job to npm audit
| * | Deduplicate package.json fileWhymarrh Whitby2018-12-072-322/+1042
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From `npm install`: > npm WARN The package css-loader is included as both a dev and production dependency. > npm WARN The package eslint-plugin-react is included as both a dev and production dependency. > npm WARN The package file-loader is included as both a dev and production dependency. > npm WARN The package gulp is included as both a dev and production dependency. It's also worth noting that the Gulp version we were using was inconsistent and there is a published v4 release on GitHub.
| * | Update ganache-core to mitigate vulnWhymarrh Whitby2018-12-072-1262/+1092
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | === npm audit security report === > # Run npm install --save-dev ganache-core@2.3.1 to resolve 1 vulnerability ┌───────────────┬──────────────────────────────────────────────────────────────┐ │ Moderate │ Memory Exposure │ ├───────────────┼──────────────────────────────────────────────────────────────┤ │ Package │ bl │ ├───────────────┼──────────────────────────────────────────────────────────────┤ │ Dependency of │ ganache-core [dev] │ ├───────────────┼──────────────────────────────────────────────────────────────┤ │ Path │ ganache-core > level-sublevel > levelup > bl │ ├───────────────┼──────────────────────────────────────────────────────────────┤ │ More info │ https://nodesecurity.io/advisories/596 │ └───────────────┴──────────────────────────────────────────────────────────────┘
| * | npm uninstall openWhymarrh Whitby2018-12-072-7/+0
| | |
| * | Remove beefy dependency and its usagesWhymarrh Whitby2018-12-073-504/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refs #4768 Refs #5389 This changeset removes the beefy package that: 1. Was last published 2 yrs ago 2. Brought with it 1 moderate and 1 critical vulnerability 3. Was only used in scripts that no longer work
| * | circleci: Replace nsp with npm auditWhymarrh Whitby2018-12-074-579/+253
| | | | | | | | | | | | Refs #4751
| * | npm audit fixWhymarrh Whitby2018-12-062-452/+392
| | |
| * | circleci: Disable npm audit when installing packagesWhymarrh Whitby2018-12-061-1/+1
| | | | | | | | | | | | | | | | | | Auditing packages when installing here doesn't help anyone as the summary isn't visible and vulnerabilities don't produce a non-zero exit code. We will have `npm audit` as an extra CI job.
| * | Update lockfile to fix errorsWhymarrh Whitby2018-12-061-11/+334
|/ / | | | | | | | | | | | | | | | | npm has informed me that the lockfile has "errors": npm ERR! code ELOCKVERIFY npm ERR! Errors were found in your package-lock.json, run npm install to fix them. npm ERR! Missing: c3@^0.6.7 npm ERR! Invalid: lock file's d3@3.5.17 does not satisfy d3@^5.7.0
* | Merge pull request #5882 from whymarrh/fix-main-container-wrapper-heightWhymarrh Whitby2018-12-061-1/+2
|\ \ | |/ |/| Force main container wrapper height to fill remaining space
| * Replace height: 100% rule with workaround for flexbox quirksWhymarrh Whitby2018-12-061-1/+2
|/
* Merge pull request #5704 from MetaMask/new-gas-customize-feature-branch-dDan J Miller2018-12-05104-264/+7147
|\ | | | | Gas customization features
| * Fix styling of send screen in extension view when hex data on.Dan Miller2018-12-044-12/+17
| |
| * Final gas customization fixesDan Miller2018-12-0418-104/+198
| |
| * Clear custom gas data on hiding of gas customization modal.Dan Miller2018-12-041-4/+12
| |
| * Modify results of API data to better fit gas chart: remove outliers, pad dataDan Miller2018-12-045-44/+126
| |
| * Add loading spinners when waiting for APIs in the gas customization modalDan Miller2018-12-049-6/+61
| |
| * Uses more reliable api on main send screen; caches basic api results in modalDan Miller2018-12-0421-140/+309
| |
| * Fix "fastest" translation message; change to sentence caseDan Miller2018-12-041-1/+1
| |
| * Improve responsiveness of customize speed up slider.Dan Miller2018-12-043-6/+76
| |
| * Make gas customization modal responsive.Dan Miller2018-12-047-1/+32
| |
| * Add c3 and d3 to the separate dependencies bundle.Dan Miller2018-12-041-0/+2
| |
| * Add gas data to integration test json data set.Dan Miller2018-12-043-3/+633
| |
| * Remove gas customization integration tests (in favour of e2e tests)Dan Miller2018-12-043-36/+317
| |
| * Fixes for components that break e2e gas customization tests, plus unit test ↵Dan Miller2018-12-049-21/+102
| | | | | | | | updates.
| * Update e2e tests for new gas customization modal.Dan Miller2018-12-045-21/+62
| |
| * Connect gas price chart to gas station api.Dan Miller2018-12-043-41/+204
| |
| * Adds speed up slide-in gas customization sidebarDan Miller2018-12-0419-58/+306
| |
| * Adds createSpeedUpTransaction to txControllerDan Miller2018-12-043-0/+97
| |
| * Redesign of gas customization basic tab.Dan Miller2018-12-048-10/+134
| |
| * Clean up for mmui-i11-custom-gas-price-chart branchDan Miller2018-12-044-33/+25
| |
| * Improve data management and tests for gas-modal-page-container price estimates.Dan Miller2018-12-044-20/+67
| |
| * Update tests, plus some lint fixes, for gas-price-chartDan Miller2018-12-043-53/+204
| |
| * Clean up gas chart code.Dan Miller2018-12-043-362/+373
| |
| * Add control arrows to advanced gas tab inputs.Dan Miller2018-12-043-1/+63
| |
| * Complete integration of gas chart with redux.Dan Miller2018-12-049-14/+148
| |
| * Read only connection of gas price chart to reduxDan Miller2018-12-0413-28/+245
| |
| * Gas price chart improvements, redesign, bug fixes, and set up to receive ↵Dan Miller2018-12-045-88/+300
| | | | | | | | external data
| * Adds not yet functional gas price chart.Dan Miller2018-12-0411-20/+290
| |
| * Lint and unit test fixes.Dan Miller2018-12-043-5/+4
| |
| * Clean up for advanced gas tab customization changes.Dan Miller2018-12-043-19/+16
| |
| * Adds redesign for the customize gas advanced tab.Dan Miller2018-12-0419-152/+332
| |
| * Test updates and additions for button integration with send screen.Dan Miller2018-12-0419-64/+465
| |
| * Integrate gas buttons with the send screen.Dan Miller2018-12-0414-41/+301
| |
| * Connects remained of the gas customization component to redux.Dan Miller2018-12-0422-194/+497
| |
| * Adds gas-duck.test.js tests.Dan Miller2018-12-041-0/+300
| |
| * Styling fixes for gas customization advanced tab content.Dan Miller2018-12-044-3/+2
| |
| * Improvements to propdefaults in button-group.component and ↵Dan Miller2018-12-042-2/+3
| | | | | | | | basic-tab-content.component
| * Connect the gas-button-group component to redux and a live api.Dan Miller2018-12-0415-111/+573
| |
| * Adds basic tab content to gas customizer, with styled button group (static, ↵Dan Miller2018-12-0416-15/+615
| | | | | | | | for now).
| * Improve styling of advanced-tab-content gasInput rowDan Miller2018-12-043-5/+11
| |
| * Add tests for advanced-tab-component.js and subcomponents.Dan Miller2018-12-045-18/+282
| |
| * Remove gas slider from advance-tab-content.componentDan Miller2018-12-043-19/+2
| |
| * Split advanced-tab-content.component.js render() method into smaller ↵Dan Miller2018-12-043-31/+63
| | | | | | | | pieces; add translations to the same file.
| * Adds the content of the advanced tab - w/o chart or dynamic content - to gas ↵Dan Miller2018-12-0421-63/+538
| | | | | | | | customize modal.
| * Use BEM for css in gas-modal-page-containerDan Miller2018-12-043-26/+28
| |
| * Use correct message key in gas-modal-page-container.component.jsDan Miller2018-12-041-1/+1
| |
| * Adds new gas customization modal container (without content)Dan Miller2018-12-0411-29/+371
|/
* Merge pull request #5876 from MetaMask/Version-5.1.0v5.1.0Thomas Huang2018-12-042-1/+8
|\ | | | | Version 5.1.0: East Bay Represent
| * Version 5.1.0: East BayDan Finlay2018-12-042-1/+8
|/
* Merge pull request #5875 from MetaMask/UpdatePhishingWarningThomas Huang2018-12-041-5/+4
|\ | | | | Update phishing warning copy
| * Update phishing warning copyDan Finlay2018-12-041-5/+4
| | | | | | | | Per advice of legal counsel.
* | Add docs link (#5870)Dan Finlay2018-12-041-1/+3
|/
* Hide link for phishing-detect page (#5864)Michael - Blurpesec2018-12-021-1/+1
| | | | | | * Soften language on phishing-detect page * remove quotes
* Merge pull request #5865 from MetaMask/mmc-fixBruno Barbieri2018-12-011-1/+0
|\ | | | | Fix visibility of mmc
| * fix visibilityBruno Barbieri2018-12-011-1/+0
|/
* Save recent network balances in local storage (#5843)Dan J Miller2018-12-0115-28/+290
| | | | | | | | | | | | * Use selector for state.metamask.accounts in all cases. * Default to cached balance when selecting metamask accounts * Adds the cached-balances controller * Documentation and small codes fixes for #5843 Co-Authored-By: danjm <danjm.com@gmail.com>
* bugfix: normalize contract addresss when fetching exchange rates (#5863)Paul Bouchon2018-12-011-1/+3
|
* Fixed Vivek's bug (#5860)Dan Finlay2018-11-301-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed Vivek's bug Fixes #5850 What was happening: It seems that his MetaMask had crashed while some new transactions had been loading defaults. He probably had a network connectivity issue to Infura (which we are working with Infura to address). As a result of this network cutout, his three unapproved transactions were not marked failed, and were not marked as `loadingDefaults = false`, as their gas prices had not yet been estimated. Normally this behavior is supposed to clean itself up when the transaction controller starts up, via the `TransactionController._onBootCleanUp()` function, but in this case, during unlock, that function was unable to do its job because when it requested the transaction list, the current network was in the `loading` state, making it proceed as if there were no pending transactions. To fix this, I am doing two things: - Setting transactions to loadingDefaults = false in more catch blocks. - Calling `onBootCleanUp()` when the network store's status changes, so that it will re-trigger when loading completes. * Fixed reference * Fixed infinite loop bug Was refreshing the tx list on every tx state change instead of just network changes, creating an infinite loop. * Add notes to tx updates to clarify logs
* Version 5.0.4 RC1 (#5859)v5.0.4Dan Finlay2018-11-302-2/+24
|
* transactions/tx-gas-utils - add the acctual response for eth_getCode for ↵Frankie2018-11-301-0/+9
| | | | NO_CONTRACT_ERROR's && add a debug object to simulationFailed (#5840)
* Merge pull request #5848 from MetaMask/Less-Certain-LanguageWhymarrh Whitby2018-11-291-1/+1
|\ | | | | Soften accusatory language on phishing warning
| * Soften accusatory language on phishing warningDan Finlay2018-11-291-1/+1
| | | | | | | | | | | | We don't always know for sure that sites marked as phishers are defiitely scams, and so we should avoid language that makes concrete accusations.
* | Merge pull request #5835 from MetaMask/revert-5412-after-install-stepsWhymarrh Whitby2018-11-275-9/+53
|\ \ | |/ |/| Open full-screen UI on install
| * Update e2e tests to handle any post-install window creationWhymarrh Whitby2018-11-273-9/+38
| |
| * Add JSDoc to closeAllWindowHandlesExcept e2e helper fnWhymarrh Whitby2018-11-271-0/+7
| |
| * Open full-screen UI on installWhymarrh Whitby2018-11-271-5/+4
| |
| * Revert "Don't open MetaMask website after install"Whymarrh Whitby2018-11-271-0/+9
|/
* Pin two module versions to avoid flatmap-stream hack (#5839)Dan Finlay2018-11-271-2/+2
| | | | | | | | | The flatmap-stream module was compromised. MetaMask was NOT affected, but two of our dependencies could include it if they updated, so I am temporarily pinning those versions until they can be updated consciously. Related to https://github.com/dominictarr/event-stream/issues/116
* Hide app-header when provider request pending (#5831)Whymarrh Whitby2018-11-272-5/+19
|
* Autofill gasPrice for retry attempts with either the recommended gasprice or ↵Frankie2018-11-272-1/+13
| | | | | | | | a %10 bump (#5786) * transactions - autofill gasPrice for retry attempts with either the recomened gasprice or a %10 bump * lint
* transactions - ensure err is defined when setting tx failed (#5801)Frankie2018-11-271-4/+6
|
* Merge pull request #5792 from MetaMask/signed-type-data-error-hw-walletBruno Barbieri2018-11-271-9/+16
|\ | | | | Consider HW Wallets for signTypedMessage
| * Use Array.includesBruno Barbieri2018-11-271-4/+4
| |
| * remove extra semicolonbrunobar792018-11-211-1/+1
| |
| * consider hw walletsbrunobar792018-11-211-9/+16
| |
* | Show disabled cursor in .network-disabled state (#5829)Whymarrh Whitby2018-11-271-1/+1
| |
* | Trim whitespace from seed phrase during import (#5827)Whymarrh Whitby2018-11-271-2/+4
| |
* | Merge pull request #5832 from whymarrh/connect-request-notifsWhymarrh Whitby2018-11-272-4/+8
|\ \ | | | | | | Show Connect Requests count in extension badge
| * | Show Connect Requests count in extension badgeWhymarrh Whitby2018-11-261-1/+3
| | |
| * | Use initState to avoid type-checking providerRequests in stateWhymarrh Whitby2018-11-261-3/+5
|/ /
* | Merge pull request #5816 from MetaMask/issue-5815Thomas Huang2018-11-2521-44/+44
|\ \ | | | | | | Increase Token Symbol length to twelve
| * | Increase Token Symbol length to twelveThomas Huang2018-11-2321-44/+44
| | |
* | | change wording of phishing notice, due to EIP 1102 (#5819)Christopher Elwell2018-11-241-1/+1
|/ / | | | | With the EIP 1102 updates, MetaMask *does* now open itself when visiting some websites. Changed the wording here to clarify that MetaMask will not open itself to ask you for your seed phrase.
* | Merge pull request #5810 from whymarrh/bump-nvmrcWhymarrh Whitby2018-11-222-9/+10
|\ \ | | | | | | Bump Node version to 8.13
| * | Update local build instructionsWhymarrh Whitby2018-11-221-8/+9
| | |
| * | nvm: Bump Node version to 8.13Whymarrh Whitby2018-11-221-1/+1
| | |
* | | Merge pull request #5797 from MetaMask/trezor-v6Bruno Barbieri2018-11-2212-45/+167
|\ \ \ | |/ / |/| | Add Firefox and Brave support for Trezor
| * | bump eth-trezor-keyringbrunobar792018-11-222-7288/+7352
| | |
| * | update package-lockbrunobar792018-11-211-7313/+7277
| | |
| * | trezor v6brunobar792018-11-213-7419/+7441
| | |
| * | fix merge conflictsbrunobar792018-11-2172-8609/+8076
| |\ \
| * | | clean upbrunobar792018-11-152-3/+2
| | | |
| * | | Merge branch 'trezor-v5' of github.com:MetaMask/metamask-extension into ↵brunobar792018-11-152-8/+19
| |\ \ \ | | | | | | | | | | | | | | | trezor-v5
| | * | | testbrunobar792018-11-151-4/+0
| | | | |
| | * | | testbrunobar792018-11-151-1/+1
| | | | |
| | * | | testbrunobar792018-11-151-1/+1
| | | | |
| | * | | try with custom boxbrunobar792018-11-151-1/+1
| | | | |
| | * | | package-lock.jsonbrunobar792018-11-151-20/+41
| | | | |
| * | | | update package-lock.jsonbrunobar792018-11-151-17/+27
| | | | |
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-157-10/+45
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-153-1/+40
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into trezor-v5brunobar792018-11-1446-479/+4603
| |\ \ \ \ \
| * \ \ \ \ \ fix merge conflictsbrunobar792018-11-07191-3748/+6145
| |\ \ \ \ \ \
| * \ \ \ \ \ \ fix merge conflictsbrunobar792018-10-21104-8896/+12489
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ fix conflictsbrunobar792018-10-17298-12054/+28334
| |\ \ \ \ \ \ \ \
| * | | | | | | | | update package-lock.jsonbrunobar792018-09-111-95/+167
| | | | | | | | | |
| * | | | | | | | | fix merge conflictsbrunobar792018-09-114-4/+8
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | update package-lock.jsonbrunobar792018-09-111-49/+126
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-09-06173-2562/+4615
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | add port names blacklistbrunobar792018-08-231-0/+8
| | | | | | | | | | | |
| * | | | | | | | | | | handle onDisconnectbrunobar792018-08-231-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | fix merge conflictsbrunobar792018-08-2311-5776/+1605
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | update package-lockbrunobar792018-08-221-6/+14
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-08-224-18/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fix commentbrunobar792018-08-211-2/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | fix merge conflictsbrunobar792018-08-21116-4856/+8379
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | update package-lockbrunobar792018-08-211-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fix e2e testsbrunobar792018-08-111-30/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | undo permission changebrunobar792018-08-111-1/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | add error messagesbrunobar792018-08-111-2/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | hide export private key for trezor accountsbrunobar792018-08-102-32/+46
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | fixesbrunobar792018-08-104-6779/+49
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | add app/vendor dir to eslintignorebrunobar792018-08-101-0/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | use new connect.js filebrunobar792018-08-102-9479/+1245
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-08-1018-29/+194
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ update package-lock.jsonbrunobar792018-08-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fix merge conflictsbrunobar792018-08-0921-32534/+32471
| | | | | | | | | | | | | | | | |