Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update package | pldespaigne | 2019-05-30 | 2 | -1/+40687 |
| | |||||
* | delete package-json | pldespaigne | 2019-05-30 | 1 | -39752/+0 |
| | |||||
* | refactor & change html pages | pldespaigne | 2019-05-05 | 5 | -154/+11 |
| | |||||
* | add rinkeby & goerli | pldespaigne | 2019-05-05 | 1 | -0/+6 |
| | |||||
* | update content-hash | pldespaigne | 2019-05-05 | 2 | -7551/+7580 |
| | |||||
* | fix npm ci bug (version mismatch) | pldespaigne | 2019-04-11 | 1 | -5/+6 |
| | |||||
* | issue#5742 | pldespaigne | 2019-04-04 | 5 | -7798/+7795 |
| | |||||
* | renaming registrar into registry | pldespaigne | 2019-04-04 | 2 | -8/+8 |
| | |||||
* | Merge pull request #6397 from MetaMask/wyre-deposit-modal | kumavis | 2019-04-04 | 1 | -4/+4 |
|\ | | | | | Change coinbase to wyre | ||||
| * | Change coinbase to wyre | Thomas Huang | 2019-04-04 | 1 | -4/+4 |
| | | |||||
* | | bump ledger and trezor keyring (#6395) | Bruno Barbieri | 2019-04-04 | 2 | -131/+195 |
| | | |||||
* | | Fix display of gas chart on Ethereum networks (#6389) | Dan J Miller | 2019-04-04 | 4 | -3/+7 |
|/ | |||||
* | Remove NoticeController (#6382) | Thomas Huang | 2019-04-02 | 25 | -1000/+77 |
| | |||||
* | Remove unused account-dropdowns components (#6363)v6.3.2 | Whymarrh Whitby | 2019-04-02 | 2 | -811/+0 |
| | |||||
* | Remove unused mascara directory (#6360) | Whymarrh Whitby | 2019-04-02 | 2 | -416/+0 |
| | |||||
* | Merge pull request #6375 from MetaMask/Version-6.3.1v6.3.1 | Thomas Huang | 2019-03-30 | 4 | -2/+16 |
|\ | | | | | Version 6.3.1 | ||||
| * | Version 6.3.1 | Dan Miller | 2019-03-30 | 2 | -1/+7 |
| | | |||||
| * | Check token name constants against the lower case methodData name in conf tx ↵ | Dan Miller | 2019-03-30 | 1 | -1/+1 |
| | | | | | | | | switch container. | ||||
| * | Ensure correct confirm screen in case of smartcontract check fail | Dan Miller | 2019-03-30 | 2 | -1/+9 |
| | | |||||
* | | About tab copy changes; Update route for Info & Help in account menu (#6356) | Chi Kei Chan | 2019-03-30 | 3 | -4/+10 |
|/ | |||||
* | Revert to providing inline defaults in getHexGasTotal and ↵ | Dan J Miller | 2019-03-29 | 1 | -4/+4 |
| | | | | increaseLastGasPrice (#6361) | ||||
* | Further e2e fixes in wake of #6364 and #6367 (#6374) | Dan J Miller | 2019-03-29 | 3 | -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-tests | Whymarrh Whitby | 2019-03-29 | 8 | -57/+132 |
|\ | | | | | Prevent infura requests in e2e tests | ||||
| * | Split e2e run-all commands onto multiple lines | Whymarrh Whitby | 2019-03-29 | 1 | -1/+2 |
| | | |||||
| * | Run from-import e2e tests with additional account, to avoid conflict with ↵ | Dan Miller | 2019-03-29 | 2 | -4/+4 |
| | | | | | | | | accounts in earlier test runs | ||||
| * | Use localhost instead of mainnent/infura for custom rpc tests in e2e tests. | Dan Miller | 2019-03-29 | 1 | -5/+5 |
| | | |||||
| * | ci: Add build:test Gulp task for e2e build | Whymarrh Whitby | 2019-03-29 | 3 | -4/+19 |
| | | |||||
| * | e2e: Update Contract Interaction wording | Whymarrh Whitby | 2019-03-29 | 1 | -3/+2 |
| | | |||||
| * | e2e: Skip approving token test | Whymarrh Whitby | 2019-03-29 | 1 | -1/+1 |
| | | |||||
| * | e2e: Remove Privacy mode toggle step | Whymarrh Whitby | 2019-03-29 | 1 | -20/+0 |
| | | |||||
| * | Retry transaction list item click in 'adds multiple transactions' tests ↵ | Dan Miller | 2019-03-29 | 1 | -1/+8 |
| | | | | | | | | first click fails. | ||||
| * | Default to localhost network when running e2e tests | Dan Miller | 2019-03-29 | 3 | -14/+15 |
| | | |||||
| * | Use webRequest to cancel all requests to infura in e2e tests. | Dan Miller | 2019-03-29 | 5 | -6/+78 |
| | | |||||
* | | Merge pull request #6328 from MetaMask/clearNotices | kumavis | 2019-03-29 | 7 | -19/+136 |
|\ \ | | | | | | | Clear notices | ||||
| * | | test - unit - ui - actions - setCompletedOnboarding - fix stub to call callback | kumavis | 2019-03-29 | 1 | -0/+2 |
| | | | |||||
| * | | lint fix | kumavis | 2019-03-29 | 2 | -2/+2 |
| | | | |||||
| * | | actions - setCompletedOnboarding - make async with pify | kumavis | 2019-03-29 | 1 | -24/+17 |
| | | | |||||
| * | | notice-controller - make markAllNoticesRead sync | kumavis | 2019-03-29 | 2 | -2/+2 |
| | | | |||||
| * | | lib - nodeify - correctly wrap synchronous functions | kumavis | 2019-03-29 | 2 | -7/+57 |
| | | | |||||
| * | | notices - markAllNoticesRead - use async/await | kumavis | 2019-03-29 | 4 | -25/+16 |
| | | | |||||
| * | | Merge branch 'develop' into clearNotices | kumavis | 2019-03-29 | 1009 | -38167/+38369 |
| |\| | |||||
| * | | Remove exclusive test | Thomas Huang | 2019-03-21 | 1 | -1/+1 |
| | | | |||||
| * | | Clear notices when setCompletedOnboarding is called | Thomas Huang | 2019-03-21 | 5 | -4/+85 |
| | | | |||||
* | | | Merge pull request #6372 from MetaMask/addAddressIfNew | kumavis | 2019-03-29 | 2 | -2/+5 |
|\ \ \ | | | | | | | | | prevent add duplicates when address is not new | ||||
| * | | | send-footer.utils.js - addressIsNew - improve readability | kumavis | 2019-03-29 | 1 | -1/+3 |
| | | | | |||||
| * | | | prevent add duplicates when address is not new | Jenny Pollack | 2019-03-29 | 2 | -2/+3 |
| | |/ | |/| | |||||
* | | | Merge pull request #5575 from vimalsagar/develop | kumavis | 2019-03-29 | 24 | -17/+240 |
|\ \ \ | |/ / |/| | | Adding CoinSwitch exchange | ||||
| * | | buy-eth-url - lint fix | kumavis | 2019-03-29 | 1 | -1/+1 |
| | | | |||||
| * | | buy-eth-url - fix variable name | kumavis | 2019-03-29 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'develop' of https://github.com/vimalsagar/metamask-extension ↵ | kumavis | 2019-03-29 | 24 | -17/+240 |
|/| | | | | | | | | | | | into vimalsagar-develop | ||||
| * | | depoit-ether-modal - make buyEth args more explicit | kumavis | 2019-03-29 | 1 | -2/+2 |
| | | | |||||
| * | | getBuyEthUrl - getDefaultServiceForNetwork then switch on service | kumavis | 2019-03-29 | 1 | -23/+29 |
| | | | |||||
| * | | PR 5575 review comment fixes | Vimal | 2019-02-28 | 2 | -24/+25 |
| | | | |||||
| * | | merging upstream branch | Vimal | 2018-11-12 | 254 | -10828/+19266 |
| |\ \ | |||||
| * | | | Adding CoinSwitch exchange | Vimal | 2018-10-22 | 24 | -1/+215 |
| | | | | |||||
* | | | | Delete some unused components (#6278) | Dan J Miller | 2019-03-28 | 0 | -0/+0 |
| | | | | |||||
* | | | | Merge pull request #6358 from MetaMask/dont-assume-tx-has-gas-data-in-list | Thomas Huang | 2019-03-28 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Gracefully handle null/undefined in a couple methods that operate on hex values | ||||
| * | | | | Defaults to the args list in increaseLastGasPrice and getHexGasTotal | Dan Miller | 2019-03-28 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | getHexGasTotal and increaseLastGasPrice now gracefully handle null and ↵ | Dan Miller | 2019-03-28 | 1 | -2/+2 |
|/ / / / | | | | | | | | | | | | | undefined values | ||||
* | | | | Open retore-vault route from popup (#6353) | Chi Kei Chan | 2019-03-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Version 6.3.0 (#6350)v6.3.0 | Dan J Miller | 2019-03-27 | 2 | -1/+16 |
| | | | | |||||
* | | | | enable privacy mode for first time users (#6347) | Thomas Huang | 2019-03-26 | 1 | -1/+3 |
| | | | | |||||
* | | | | Don't include tx value in calculation of balance sufficiency for cancel ↵ | Dan J Miller | 2019-03-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | button disabling. (#6346) | ||||
* | | | | E2E - Dont close window notifications (#6349) | Thomas Huang | 2019-03-26 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Dont close window notifications * Remove commented out lines in beta spec | ||||
* | | | | Cancel error rebased (#6341) | Dan J Miller | 2019-03-26 | 4 | -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 Miller | 2019-03-26 | 3 | -33/+88 |
| | | | | |||||
* | | | | New settings page rebased (#6333) | Dan J Miller | 2019-03-26 | 19 | -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 Miller | 2019-03-22 | 5 | -17/+30 |
| | | | | |||||
* | | | | Fix oversized loading overlay on gas customization modal. (#6326) | Dan J Miller | 2019-03-22 | 1 | -0/+4 |
| | | | | |||||
* | | | | Fix gas fee in the submitted step of the transaction details activity log. ↵ | Dan J Miller | 2019-03-22 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | (#6301) | ||||
* | | | | Hide gas price chart and prevent api call when not on ethereum networks. (#6300) | Dan J Miller | 2019-03-22 | 10 | -25/+76 |
| | | | | | | | | | | | | Add missing translations in gas customization modal | ||||
* | | | | Folder restructure (#6304) | Chi Kei Chan | 2019-03-22 | 984 | -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 Barbieri | 2019-03-22 | 3 | -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 Stevens | 2019-03-22 | 2 | -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) | fixanoid | 2019-03-21 | 2 | -2/+2 |
| |_|/ |/| | | |||||
* | | | Merge pull request #6327 from MetaMask/eth-contract-metadata | Whymarrh Whitby | 2019-03-21 | 2 | -376/+153 |
|\ \ \ | | | | | | | | | Update eth-contract-metadata dependency and sub-dependencies | ||||
| * | | | Bump gaba version to avoid broken eth-contract-metadata | Whymarrh Whitby | 2019-03-21 | 2 | -376/+153 |
|/ / / | |||||
* | | | Add rollback script, move auto-changelog script (#6252) | Dan Finlay | 2019-03-20 | 4 | -5/+41 |
| | | | |||||
* | | | Fix typos in English messages (#6317) | Thomas Huang | 2019-03-19 | 1 | -2/+2 |
| | | | |||||
* | | | Fixes popups not showing when screen size is odd (#6312) | William Monti Souza | 2019-03-18 | 1 | -2/+2 |
| | | | |||||
* | | | Centre the notification in the current window (#6307) | Whymarrh Whitby | 2019-03-15 | 1 | -4/+3 |
| | | | |||||
* | | | Merge pull request #6298 from whymarrh/node-8.15.1 | Whymarrh Whitby | 2019-03-13 | 2 | -18/+18 |
|\ \ \ | | | | | | | | | Node 8.15.x | ||||
| * | | | ci: Skip updating npm@6 as it is default | Whymarrh Whitby | 2019-03-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update Node minor version | Whymarrh Whitby | 2019-03-13 | 2 | -16/+16 |
| | | | | |||||
* | | | | Merge pull request #6213 from whymarrh/seed-phrase-newline | Whymarrh Whitby | 2019-03-13 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Allow seed phrases with a trailing newline | ||||
| * | | | Allow seed phrases with a trailing newline | Whymarrh Whitby | 2019-03-13 | 1 | -1/+1 |
|/ / / | |||||
* | | | Patch/bump version (#6294)v6.2.2 | Thomas Huang | 2019-03-13 | 2 | -2/+9 |
| | | | |||||
* | | | Merge pull request #6281 from MetaMask/fix-browser-back-on-reveal-seed | Thomas Huang | 2019-03-13 | 1 | -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 screen | Dan Miller | 2019-03-12 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #6292 from whymarrh/npm-ci | kumavis | 2019-03-12 | 1 | -8/+1 |
|\ \ \ \ | | | | | | | | | | | Use npm ci for fast(er) installs on CI | ||||
| * | | | | ci: Use npm ci for fast(er) installs | Whymarrh Whitby | 2019-03-12 | 1 | -8/+1 |
| | | | | | |||||
* | | | | | build - babel - move config to babelrc (#6284) | kumavis | 2019-03-12 | 2 | -26/+23 |
| | | | | | |||||
* | | | | | Merge pull request #6271 from whymarrh/centre-notificatons | kumavis | 2019-03-12 | 1 | -5/+10 |
|\ \ \ \ \ | |/ / / / |/| | | | | Centre all notification popups | ||||
| * | | | | Centre all notification popups | Whymarrh Whitby | 2019-03-12 | 1 | -5/+10 |
| | | | | | |||||
* | | | | | Improve Korean translations (#6268) | bowbowbow | 2019-03-12 | 1 | -29/+350 |
| | | | | | |||||
* | | | | | ui - add missing PropTypes (#6287) | kumavis | 2019-03-12 | 2 | -0/+3 |
|/ / / / | |||||
* | | | | circleci - disable npm dep cache (#6288) | kumavis | 2019-03-12 | 1 | -7/+7 |
| | | | | |||||
* | | | | mascara - remove from project (#6283) | kumavis | 2019-03-12 | 33 | -726/+24 |
| | | | | |||||
* | | | | Merge pull request #6289 from whymarrh/fix-ci-deps | kumavis | 2019-03-12 | 2 | -448/+1224 |
|\ \ \ \ | | | | | | | | | | | Allow npm to update package-lock.json file | ||||
| * | | | | npm i -D ganache-core@2.5.3 | Whymarrh Whitby | 2019-03-12 | 2 | -368/+984 |
| | | | | | |||||
| * | | | | Allow npm to update the package-lock.json file | Whymarrh Whitby | 2019-03-12 | 1 | -90/+250 |
|/ / / / | |||||
* | | | | ci: Use cache version from circle environment var (#6286) | kumavis | 2019-03-12 | 1 | -2/+2 |
| | | | | |||||
* | | | | GABA: Integrate AddressBookController (#5847) | Paul Bouchon | 2019-03-12 | 6 | -221/+532 |
| | | | | | | | | | | | | | | | | | | | | | | | | * gaba: integrate AddressBookController * pin gaba version and update lockfile | ||||
* | | | | Merge pull request #6279 from MetaMask/notification-window | Thomas Huang | 2019-03-12 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Nonmultiple notifications for batch txs | ||||
| * | | | | Nonmultiple notifications for batch txs | Thomas Huang | 2019-03-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #6280 from MetaMask/network-checksum-disable | Thomas Huang | 2019-03-12 | 1 | -2/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | No longer check network when validating checksum addresses | ||||
| * | | | | | Remove line rather than comment out | Thomas Huang | 2019-03-12 | 1 | -4/+0 |
| | | | | | | |||||
| * | | | | | No longer check network when validating checksum addresses | Thomas Huang | 2019-03-12 | 1 | -2/+5 |
| | | | | | | |||||
* | | | | | | Version 6.2.1 (#6251) | Thomas Huang | 2019-03-12 | 2 | -1/+3 |
|/ / / / / | |||||
* | / / / | development - enhancement for sourcemap validator tool (#6277) | kumavis | 2019-03-12 | 1 | -22/+71 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #6261 from Pedro-vk/patch-1 | Thomas Huang | 2019-03-08 | 1 | -18/+18 |
|\ \ \ \ | |/ / / |/| | | | Uppercase and context fixes on Spanish translation. | ||||
| * | | | Uppercase and context fixes on Spanish translation. | Pedro Gutiérrez | 2019-03-07 | 1 | -18/+18 |
|/ / / | |||||
* | | | Handle undefined gas limits and prices in transaction-breakdown.component ↵ | Dan J Miller | 2019-03-07 | 2 | -21/+38 |
| | | | | | | | | | | | | (#6246) | ||||
* | | | Add privacy policy link to modal metrics opt-in (#6250) | Dan J Miller | 2019-03-07 | 1 | -1/+7 |
| | | | |||||
* | | | Prevent advanced gas input arrows from setting value to < 0 (#6248) | Dan J Miller | 2019-03-07 | 2 | -4/+24 |
| | | | |||||
* | | | Only call onRecipient and onSender methods if defined in sender-to-recipient ↵ | Dan J Miller | 2019-03-07 | 1 | -2/+6 |
| | | | | | | | | | | | | (#6247) | ||||
* | | | Fix missing this reference in addtoken button onclick method (#6245) | Dan J Miller | 2019-03-06 | 1 | -1/+2 |
| | | | |||||
* | | | Fixes the 'Percentages row tracks and gutters' decpracation warning. (#6244) | Dan J Miller | 2019-03-06 | 1 | -1/+1 |
| | | | |||||
* | | | Version 6.2.0 (#6239)v6.2.0 | Dan J Miller | 2019-03-06 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | * Version 6.2.0 RC1 * Update changelog.md for 6.2.0 | ||||
* | | | Metametrics fixes (#6238) | Dan J Miller | 2019-03-06 | 6 | -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-description | Thomas Huang | 2019-03-06 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Metrics description | ||||
| * | | | Wrap in span | Thomas Huang | 2019-03-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix typo | Thomas Huang | 2019-03-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | Fix MetaMetrics Environment Check (#6235) | Dan J Miller | 2019-03-06 | 1 | -1/+1 |
| | | | |||||
* | | | Metametrics (#6171) | Dan J Miller | 2019-03-05 | 94 | -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-6221 | Thomas Huang | 2019-03-05 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Show popup if notification or activeMMtab is true | ||||
| * | | | Simplify | Thomas Huang | 2019-03-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Improvement | Thomas Huang | 2019-03-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Show popup if notification or activeMMtab is true but not if popup is open | Thomas Huang | 2019-03-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | bump trezor-connect to v7 (#6224) | Bruno Barbieri | 2019-03-05 | 2 | -37/+46 |
|/ / / | |||||
* | | | First time flow updates (#6192) | Dan J Miller | 2019-02-27 | 41 | -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 Chan | 2019-02-27 | 39 | -113/+1169 |
| | | | |||||
* | | | Merge pull request #6190 from whymarrh/tmp.RvdXXs4i | kumavis | 2019-02-26 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | Remove public property from package.json file | ||||
| * | | | Remove public property from package.json file | Whymarrh Whitby | 2019-02-21 | 1 | -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 Finlay | 2019-02-26 | 18 | -78/+760 |
| | | | | |||||
* | | | | Fix gas estimation when sending to contracts (#6195) | Dan J Miller | 2019-02-26 | 6 | -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-ui | Whymarrh Whitby | 2019-02-21 | 127 | -20282/+12 |
|\ \ \ \ | | | | | | | | | | | Delete the old UI | ||||
| * | | | | Remove unused CI jobs, rename e2e beta jobs | Whymarrh Whitby | 2019-02-21 | 2 | -16/+12 |
| | | | | | |||||
| * | | | | Remove outdated ui dev and ui mock docs | Whymarrh Whitby | 2019-02-21 | 4 | -18/+0 |
| | | | | | |||||
| * | | | | Delete old-ui folder | Whymarrh Whitby | 2019-02-21 | 121 | -20248/+0 |
| |/ / / | |||||
* / / / | account tracker - update accounts from balanceChecker contract (#6181) | Jenny Pollack | 2019-02-21 | 3 | -3/+70 |
|/ / / | | | | | | | | | | | | | | | | * account tracker - update accounts from balanceChecker contract * fall back to getBalance if the contract query fails | ||||
* | | | Disable npm audit (#6188) | Thomas Huang | 2019-02-21 | 1 | -13/+13 |
| | | | |||||
* | | | fix: update README to add a missing " " space (#6191) | Alon Bukai | 2019-02-21 | 1 | -1/+1 |
| | | | |||||
* | | | EIP-1193: standard provider API (#6170) | Paul Bouchon | 2019-02-20 | 9 | -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/6132 | Dan J Miller | 2019-02-20 | 2 | -1/+26 |
|\ \ \ | | | | | | | | | turn camcelCase method name to space separated | ||||
| * | | | turn camcelCase method name to space separated | Chi Kei Chan | 2019-02-19 | 2 | -1/+26 |
| | | | | |||||
* | | | | Merge pull request #6185 from chikeichan/5681 | Dan J Miller | 2019-02-20 | 1 | -5/+0 |
|\ \ \ \ | | | | | | | | | | | Remove password check when importing Account JSON | ||||
| * | | | | Remove password check when importing Account JSON | Chi Kei Chan | 2019-02-19 | 1 | -5/+0 |
| |/ / / | |||||
* | | | | Merge pull request #6183 from chikeichan/5171 | Dan J Miller | 2019-02-20 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Bring Popup to front when ui is tiggered | ||||
| * | | | | Bring Popup to front when ui is tiggered | Chi Kei Chan | 2019-02-19 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #6187 from MetaMask/Version-6.1.0 | Thomas Huang | 2019-02-20 | 4 | -1/+56 |
|\ \ \ \ | | | | | | | | | | | Version 6.1.0 | ||||
| * | | | | Add sensitive publishing protocolv6.1.0 | Dan Finlay | 2019-02-20 | 2 | -0/+47 |
| | | | | | |||||
| * | | | | Version 6.1.0 RC1 | Dan Finlay | 2019-02-20 | 2 | -1/+9 |
|/ / / / | |||||
* / / / | Change "Token Address" to "Token Contract Address" (#6182) | Chi Kei Chan | 2019-02-20 | 2 | -1/+4 |
|/ / / | |||||
* | | | Fix inpage.js event handler memory leak (#6177) | Graham Kaemmer | 2019-02-19 | 1 | -4/+5 |
| | | | | | | | | | Fixes #6176 | ||||
* | | | Add Copy Tx ID button to transaction-list-item-details (#6146) | Chi Kei Chan | 2019-02-17 | 4 | -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-config | Whymarrh Whitby | 2019-02-15 | 1 | -13/+0 |
|\ \ \ | | | | | | | | | Delete unused Travis CI config | ||||
| * | | | Delete unused Travis CI config | Whymarrh Whitby | 2019-02-15 | 1 | -13/+0 |
|/ / / | |||||
* | | | Merge pull request #6137 from whymarrh/es6-background | Whymarrh Whitby | 2019-02-14 | 8 | -32/+32 |
|\ \ \ | | | | | | | | | Sprinkle ES6 onto background files | ||||
| * | | | Update popup-core script to use ES6 destructuring, const, let | Whymarrh Whitby | 2019-02-12 | 1 | -6/+6 |
| | | | | |||||
| * | | | Update platforms/extension to use ES6 destructuring requires | Whymarrh Whitby | 2019-02-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update phishing-detect script to use ES6 destructuring requires | Whymarrh Whitby | 2019-02-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update NoticesController to use ES6 destructuring, const, let | Whymarrh Whitby | 2019-02-12 | 1 | -3/+3 |
| | | | | |||||
| * | | | Update MetaMaskController to use ES6 destructuring, const, let | Whymarrh Whitby | 2019-02-12 | 1 | -5/+5 |
| | | | | |||||
| * | | | Fix all "var used instead of let or const" problems in inpage.js | Whymarrh Whitby | 2019-02-12 | 1 | -4/+4 |
| | | | | |||||
| * | | | Update contentscript to use ES6 destructuring, const, let | Whymarrh Whitby | 2019-02-12 | 1 | -5/+5 |
| | | | | |||||
| * | | | Fix all "var used instead of let or const" problems in background.js | Whymarrh Whitby | 2019-02-12 | 1 | -7/+7 |
| | | | | |||||
* | | | | Checksum address before slicing it for the confirm screen (#6133) | Whymarrh Whitby | 2019-02-14 | 1 | -2/+6 |
| | | | | |||||
* | | | | Fixed issue #5838 (#6001) | Jonathan Smirnoff | 2019-02-14 | 14 | -18/+46 |
| | | | | | | | | | | | | Update changelog file | ||||
* | | | | Adds tests for advanced gas controls on confim screen (#6144) | Dan J Miller | 2019-02-13 | 1 | -1/+47 |
| | | | | |||||
* | | | | Add button to force edit token symbol when adding custom token (#6147) | Chi Kei Chan | 2019-02-13 | 2 | -2/+38 |
| | | | | |||||
* | | | | Merge pull request #6124 from MetaMask/dissable-recent-block-controller | Thomas Huang | 2019-02-13 | 3 | -4/+30 |
|\ \ \ \ | | | | | | | | | | | recent-blocks - dont listen for block when on infura providers | ||||
| * | | | | fix typo | frankiebee | 2019-02-13 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | recent-blocks - dont listen for block when on infura providers | frankiebee | 2019-02-12 | 3 | -4/+30 |
| | | | | | |||||
* | | | | | Version 6.0.1 (#6141)v6.0.1 | Whymarrh Whitby | 2019-02-13 | 2 | -1/+9 |
| | | | | | |||||
* | | | | | Merge pull request #6139 from whymarrh/fix-confirm-advanced-gas | Whymarrh Whitby | 2019-02-12 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix advanced gas controls on the confirm screen | ||||
| * | | | | | Fix advanced gas controls on the confirm screen | Whymarrh Whitby | 2019-02-12 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #6134 from whymarrh/first-time-seed-whitespace | Whymarrh Whitby | 2019-02-12 | 1 | -2/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | Trim whitespace from seed phrase during import | ||||
| * | | | | Trim whitespace from seed phrase during import | Whymarrh Whitby | 2019-02-12 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | Somehow we lost 33b85cf2e | ||||
* | | | | | Update Italian translation (#6119) | matteopey | 2019-02-12 | 1 | -40/+277 |
| | | | | | |||||
* | | | | | Improved Traditional Chinese translation (#6125) | S.C. Chen | 2019-02-12 | 1 | -102/+735 |
|/ / / / | |||||
* | | | | Version 6 RC1 (#6117) | Dan Finlay | 2019-02-12 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Version 6 RC1 * Make gas input feature more readable * Update CHANGELOG.md with additional 6.0.0 changes | ||||
* | | | | Merge pull request #6131 from MetaMask/docs-patch | Whymarrh Whitby | 2019-02-12 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | Add native deps compilation troubleshooting to README | ||||
| * | | | Add native deps compilation troubleshooting to docs | Whymarrh Whitby | 2019-02-11 | 1 | -0/+1 |
|/ / / | | | | | | | See also #6043 | ||||
* | | | Merge pull request #6122 from whymarrh/fix-gas-editing | Whymarrh Whitby | 2019-02-09 | 7 | -76/+147 |
|\ \ \ | | | | | | | | | Fix advanced inline gas editing | ||||
| * | | | Add e2e tests adjusting gas before sending | Whymarrh Whitby | 2019-02-09 | 2 | -12/+96 |
| | | | | |||||
| * | | | Fix inline advanced gas editing | Whymarrh Whitby | 2019-02-09 | 6 | -64/+51 |
| | | | | |||||
* | | | | Fix locale codes contains underscore will never be preferred (#6116) | S.C. Chen | 2019-02-09 | 1 | -4/+11 |
|/ / / | |||||
* | | | Merge pull request #6121 from whymarrh/audit-deps | Whymarrh Whitby | 2019-02-09 | 1 | -12/+40 |
|\ \ \ | | | | | | | | | Fix 1 moderate severity vulnerability with deps | ||||
| * | | | Fix 1 moderate severity vulnerability with deps | Whymarrh Whitby | 2019-02-08 | 1 | -12/+40 |
| | | | | |||||
* | | | | implement class for sign footer button (#6120) | Brandon Wissmann | 2019-02-08 | 1 | -0/+1 |
|/ / / | |||||
* | | | Set custom gas data in state from inline advance gas controls on send screen ↵ | Dan J Miller | 2019-02-07 | 2 | -2/+11 |
| | | | | | | | | | | | | (#6114) | ||||
* | | | Add Swap feature to CurrencyInput (#6091) | Chi Kei Chan | 2019-02-06 | 8 | -45/+152 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Add Swap feature to CurrencyInput * Fix linter error * Fix and Add unit tests | ||||
* | | | Change gas labels to Slow/Average/Fast (#6090) | Chi Kei Chan | 2019-02-06 | 2 | -60/+60 |
| | | | | | | | | | | | | | | | | | | * Change gas labels to Slow/Average/Fast * Fix unit test | ||||
* | | | Add togglable advanced gas controls on send and confirm screens (#6112) | Dan J Miller | 2019-02-06 | 20 | -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-redesign | Whymarrh Whitby | 2019-02-06 | 3 | -77/+465 |
|\ \ \ | | | | | | | | | Update design of phishing warning screen | ||||
| * | | | Update design of phishing warning screen | Whymarrh Whitby | 2019-02-06 | 3 | -77/+465 |
|/ / / | |||||
* | | | Merge pull request #6082 from whymarrh/migrate-to-new-ui | Whymarrh Whitby | 2019-02-05 | 25 | -229/+177 |
|\ \ \ | | | | | | | | | Migrate all users to the new UI | ||||
| * | | | Add announcement for users migrated to the new UI | Whymarrh Whitby | 2019-02-05 | 15 | -50/+122 |
| | | | | |||||
| * | | | Remove betaUI preference state, replace with completedUiMigration | Whymarrh Whitby | 2019-02-05 | 3 | -9/+42 |
| | | | | |||||
| * | | | Default to the new UI for all users | Whymarrh Whitby | 2019-02-05 | 6 | -116/+13 |
| | | | | |||||
| * | | | Remove commented references to Beta UI | Whymarrh Whitby | 2019-02-05 | 1 | -18/+0 |
| | | | | |||||
| * | | | Remove "Use old UI" setting | Whymarrh Whitby | 2019-02-05 | 2 | -37/+1 |
|/ / / | |||||
* | | | Version 5.3.5 (#6109)v5.3.5 | Whymarrh Whitby | 2019-02-05 | 2 | -1/+5 |
| | | | |||||
* | | | Privacy mode fixes (#6087) | Bruno Barbieri | 2019-02-02 | 2 | -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 Finlay | 2019-02-01 | 2 | -1/+5 |
| | | | |||||
* | | | fix - migration 30 undefinds (#6079) | Frankie | 2019-02-01 | 1 | -16/+18 |
| | | | |||||
* | | | Merge pull request #6076 from MetaMask/Version-5.3.3 | Thomas Huang | 2019-01-31 | 2 | -1/+8 |
|\ \ \ | | | | | | | | | Version 5.3.3 RC1 | ||||
| * | | | Version 5.3.3 RC1v5.3.3 | Dan Finlay | 2019-01-31 | 2 | -1/+8 |
|/ / / | |||||
* | | | EIP-1102 updates (#6006) | Paul Bouchon | 2019-01-31 | 8 | -42/+49 |
| | | | | | | | | | | | | | | | | | | * Update privacy notice * Respond to 1102 messages using tab ID | ||||
* | | | Remove unused InitializeMenuScreen component (#6075) | Whymarrh Whitby | 2019-01-31 | 1 | -224/+0 |
| | | | |||||
* | | | Improved Spanish translations (#6072) | Pedro Gutiérrez | 2019-01-31 | 1 | -13/+13 |
| | | | |||||
* | | | Merge pull request #6074 from MetaMask/ui-codeowners | Whymarrh Whitby | 2019-01-30 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update UI code owners | ||||
| * | | | Update UI codeowners | Whymarrh Whitby | 2019-01-30 | 1 | -1/+1 |
|/ / / | |||||
* | | | e2e: Use close instead of save for gas modal (#6066) | Thomas Huang | 2019-01-30 | 1 | -1/+2 |
| | | | |||||
* | | | Add visual indicator when displaying a cached balance (#5854) | Dan J Miller | 2019-01-30 | 22 | -31/+161 |
| | | | |||||
* | | | I#5956 fix2 dont overwrite existing rpc settings (#6044) | Frankie | 2019-01-30 | 7 | -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 Finlay | 2019-01-29 | 2 | -1/+10 |
| | | | |||||
* | | | Merge pull request #6021 from MetaMask/i5943-shapeshift-tx | Dan J Miller | 2019-01-26 | 4 | -50/+1028 |
|\ \ \ | | | | | | | | | Order shapeshift transactions by time within the transactions list | ||||
| * | | | Fix bugs in e2e tests related to gas customization inputs. | Dan Miller | 2019-01-25 | 1 | -14/+17 |
| | | | | |||||
| * | | | Add integration test for ordering of shapeshift txs in history list. | Dan Miller | 2019-01-25 | 2 | -8/+227 |
| | | | | |||||
| * | | | Fix integration tests | Alexander Tseung | 2019-01-25 | 2 | -20/+756 |
| | | | | |||||
| * | | | Order shapeshift transactions by time within the transactions list | Alexander Tseung | 2019-01-25 | 1 | -12/+32 |
| | | | | |||||
* | | | | add source for header in create infura client (#6023) | Jenny Pollack | 2019-01-25 | 2 | -679/+266 |
|/ / / | | | | | | | | | | | | | | | | * add source for header in create infura client * bump eth-json-rpc-infura | ||||
* | | | Prevent send to token warning (#6058) | Esteban Miño | 2019-01-24 | 28 | -15/+256 |
| | | | |||||
* | | | Refactor first time flow, remove seed phrase from state (#5994) | Alexander Tseung | 2019-01-23 | 114 | -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 renwick | 2019-01-23 | 1 | -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ño | 2019-01-23 | 9 | -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 Barbieri | 2019-01-23 | 3 | -7/+45 |
| | | | |||||
* | | | Use Parity on-chain registry only when is needed (#6052) | Esteban Miño | 2019-01-23 | 7 | -6/+61 |
| | | | | | | | | | | | | | | | | | | * add and use knownMethodData to avoid infura requests * dataMethod to methodData and check empty response | ||||
* | | | Refactor BalanceComponent to jsx (#6048) | Alexander Tseung | 2019-01-21 | 6 | -250/+121 |
| | | | |||||
* | | | I#5956 fix 1 (#6026) | Frankie | 2019-01-18 | 5 | -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 Tseung | 2019-01-17 | 2 | -3/+3 |
| | | | |||||
* | | | Merge pull request #6027 from MetaMask/Version-5.3.1 | Thomas Huang | 2019-01-17 | 2 | -1/+14 |
|\ \ \ | | | | | | | | | Version 5.3.1 RC2 | ||||
| * \ \ | Merge branch 'develop' into Version-5.3.1v5.3.1 | Dan Finlay | 2019-01-17 | 1 | -18/+18 |
| |\ \ \ | |||||
| * | | | | Version 5.3.1 RC2 | Dan Finlay | 2019-01-17 | 2 | -1/+14 |
| | | | | | |||||
* | | | | | Disable account dropdown on signing screens (#6024) | Alexander Tseung | 2019-01-17 | 5 | -85/+195 |
| |/ / / |/| | | | |||||
* | | | | Skip drizzle tests unit issue with ci is determined (#5982) | Thomas Huang | 2019-01-17 | 1 | -18/+18 |
|/ / / | |||||
* | | | Merge pull request #5966 from filips123/patch-1 | Thomas Huang | 2019-01-11 | 1 | -3/+180 |
|\ \ \ | | | | | | | | | Update Slovenian translation | ||||
| * \ \ | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension ↵ | Filip Š | 2019-01-10 | 17 | -278/+445 |
| |\ \ \ | | | | | | | | | | | | | | | | into patch-1 | ||||
| * | | | | Update Slovenian translation | Filip Š | 2018-12-26 | 1 | -3/+180 |
| | | | | | |||||
* | | | | | Set auto conversion off for token/eth conversion (#6005) | Thomas Huang | 2019-01-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix confirm screen for sending ether tx with hex data (#6008) | Alexander Tseung | 2019-01-11 | 1 | -0/+6 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #5999 from MetaMask/app-description | Thomas Huang | 2019-01-06 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Refine app description | ||||
| * | | | | Refine app description | Dan Finlay | 2019-01-06 | 1 | -1/+1 |
|/ / / / | | | | | | | | | Should help SEO on the chrome store. | ||||
* | | | | Merge pull request #5997 from whymarrh/drizzle-script | Thomas Huang | 2019-01-05 | 1 | -9/+24 |
|\ \ \ \ | | | | | | | | | | | Harden Drizzle test runner script | ||||
| * | | | | Clean up drizzle test runner script | Whymarrh Whitby | 2019-01-04 | 1 | -10/+21 |
| | | | | | |||||
| * | | | | Revert "remove error flags from drizzle setup" | Whymarrh Whitby | 2019-01-04 | 1 | -0/+4 |
|/ / / / | | | | | | | | | | | | | This reverts commit 938f4286e49dbdf7aef5b767917ad34ec6c6bb04. | ||||
* | | | | Fix ERC20 token value decoding (#5995) | Hsuan Lee | 2019-01-04 | 1 | -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/develop | Vincent | 2019-01-04 | 1 | -6/+6 |
|\ \ \ \ | | | | | | | | | | | Fixed a word french translation (several occurrences of connection instead of connexion) |