aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix merge conflictsbrunobar792018-07-035-3655/+2782
|\
| * npm 6 fresh lock + node 8 (#4675)Bruno Barbieri2018-07-034-32479/+32280
| | | | | | | | | | | | | | * run npm install with npm 6 and node 8 * npm audit fix --force * bump node version on circleci docker img * bump lodash
| * Merge pull request #4692 from MetaMask/improve-e2e-beta-test-startupWhymarrh Whitby2018-07-021-5/+11
| |\ | | | | | | Improve checks for closing info page on app installation in e2e beta tests.
| | * Improve checks for closing info page on app installation in e2e beta tests.Dan2018-06-291-5/+11
| | |
* | | move hardcoded strings to localization filebrunobar792018-07-032-17/+22
| | |
* | | always open connect hardware in full screen modebrunobar792018-07-031-1/+9
| | |
* | | allow to open specific route in fullscreen modebrunobar792018-07-031-2/+5
| | |
* | | fix environment detection regexbrunobar792018-07-031-1/+1
| | |
* | | use latest eth-keyring-controllerbrunobar792018-07-022-3/+4
| | |
* | | fix merge conflictsbrunobar792018-07-0295-7184/+8625
|\| |
| * | Merge pull request #4687 from snreynolds/i4623-getConvertedCurrencyDan J Miller2018-06-308-24/+9
| |\ \ | | | | | | | | fixes #4623
| | * | fixes #4623Sara Reynolds2018-06-308-24/+9
| | |/
| * | Merge pull request #4640 from weijiekoh/developDan J Miller2018-06-302-1/+8
| |\ \ | | | | | | | | Fix for #4639: display values of EIP712 typed boolean fields in the signing prompt
| | * | Fixed lint errorKoh Wei Jie2018-06-281-1/+1
| | | |
| | * | removed stray console.logKoh Wei Jie2018-06-221-1/+0
| | | |
| | * | fixed blank boolean field for typed signing for old UIKoh Wei Jie2018-06-221-1/+5
| | | |
| | * | fixed blank boolean field for typed signing for new UIKoh Wei Jie2018-06-221-0/+4
| | | |
| * | | Merge pull request #4647 from MetaMask/fix-overflow-currency-displayDan J Miller2018-06-303-2/+12
| |\ \ \ | | | | | | | | | | Fix issues with scrollbar in currency display.
| | * | | Improve attribute syntax in send-amount-row.component.jsDan J Miller2018-06-301-1/+1
| | | | |
| | * | | Remove input arrows for send screen amount row on firefox.Dan2018-06-293-0/+11
| | | | |
| | * | | Fix issues with scrollbar in currency display.Dan2018-06-292-2/+1
| | | |/ | | |/|
| * | | Merge pull request #4690 from MetaMask/i4662-token-gas-estimate-uxDan Finlay2018-06-293-0/+11
| |\ \ \ | | | | | | | | | | Set base estimate for token sends to be updated once recipient address specified
| | * | | Set based estimate for token sends to be updated once recipient address ↵Dan2018-06-293-0/+11
| | |/ / | | | | | | | | | | | | specified.
| * | | Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-styleThomas Huang2018-06-292-7/+26
| |\ \ \ | | |/ / | |/| | Fix style of shapeshift screen in deposit modal.
| | * | Fix style of shapeshift screen in deposit modal.Dan2018-06-222-7/+26
| | |/
| * | Merge pull request #4678 from MetaMask/e2e-beta-tests-upgradeDan J Miller2018-06-2910-6749/+7671
| |\ \ | | | | | | | | E2e beta tests upgrade
| | * | Use supersonic instead of httpserver to serve local dapp (e2e beta tests)Dan2018-06-283-21/+543
| | | |
| | * | Turn off failing e2e beta assertion in firefox until bugs in ↵Dan2018-06-281-2/+6
| | | | | | | | | | | | | | | | webdriver/geckodriver are resolved.
| | * | Update condition for backspace in customize gas step of token factory send ↵Dan2018-06-281-1/+4
| | | | | | | | | | | | | | | | test (e2e beta).
| | * | Update package-lock.jsonDan2018-06-281-6526/+6601
| | | |
| | * | Fix add existing token test (e2e beta tests).Dan2018-06-271-3/+1
| | | |
| | * | Switch to eth and back before asserting on token balance (e2e beta token tests).Dan2018-06-271-1/+2
| | | |
| | * | await all clicks in e2e beta tests.Dan2018-06-271-9/+11
| | | |
| | * | Close popup window for e2e beta token factory send test.Dan2018-06-271-2/+3
| | | |
| | * | Fix retype seed phrase button.Dan2018-06-271-35/+46
| | | |
| | * | Disable e2e beta assertion after first token addition because of firefox / ↵Dan2018-06-271-1/+8
| | | | | | | | | | | | | | | | webdriver bug.
| | * | Pass correct params to verboseReportOnFailure in beta e2e tests.Dan2018-06-271-1/+1
| | | |
| | * | Add timeouts to certain beta e2e driver.waits.Dan2018-06-271-2/+2
| | | |
| | * | Add try catch to deal with false negative timeouts in beta e2e tests.Dan2018-06-271-7/+22
| | | |
| | * | Wait for element text match in metamask-beta-ui e2e send token testDan2018-06-271-4/+2
| | | |
| | * | Use locally served dapp to test contract calls in e2e beta testsDan2018-06-276-174/+131
| | | |
| | * | Add extra delay to e2e tests after remix page load.Dan2018-06-271-0/+1
| | | |
| | * | Fix send token tests in beta ui e2e tests.Dan2018-06-272-9/+26
| | | |
| | * | Speed up page opening and fix timeout errors on remix page opening in beta ↵Dan2018-06-272-13/+26
| | | | | | | | | | | | | | | | e2e tests.
| | * | Add delay before regularly failing test.Dan2018-06-271-0/+1
| | | |
| | * | Fix element located bug in beta e2e contract method call test.Dan2018-06-271-1/+1
| | | |
| | * | Improve wait for buy modal render after first time flow in beta e2e tests.Dan2018-06-271-1/+2
| | | |
| | * | Only show the customize gas modal if the estimateGas call is not currently ↵Dan2018-06-274-6/+79
| | | | | | | | | | | | | | | | in flight.
| | * | Update metamask-beta-ui e2e spec to fail on insufficient gas estimation.Dan2018-06-271-7/+31
| | | |
| | * | Wait for locating of submit buttons before attempting to click in ↵Dan2018-06-271-3/+8
| | | | | | | | | | | | | | | | metamask.spec.js
| | * | Update tests to accomodate token list menu additions.Dan2018-06-271-1/+2
| | | |
| | * | Disable onbeforeunload alert on remix for contract integration tests.Dan2018-06-271-0/+1
| | | |
| | * | Adds test for hiding tokens.Dan2018-06-271-0/+19
| | | |
| | * | e2e beta tests for contract deployment and calling a contract method.Dan2018-06-272-2/+135
| | | |
| | * | Improve reliability of beta e2e tests by using webdriver apis to wait for ↵Dan2018-06-272-5/+12
| | | | | | | | | | | | | | | | certain dom elements.
| | * | Add test for importing from private key to from-import-beta-ui.spec.js, and ↵Dan2018-06-272-125/+19
| | | | | | | | | | | | | | | | remove non-import related tests from that file.
| | * | metamask-beta-ui.spec.js tests custom token send before searched token.Dan2018-06-271-38/+43
| | | |
| | * | Adds e2e tests for sending tokens from token factory.Dan2018-06-271-3/+61
| | | |
| | * | Adds e2e tests for sending tokens within metamask.Dan2018-06-271-0/+44
| | | |
| | * | Adds e2e tests for sending tokens from token factory.Dan2018-06-271-3/+61
| | | |
| | * | Adds e2e tests for sending tokens within metamask.Dan2018-06-271-2/+48
| | | |
| * | | Merge pull request #4674 from MetaMask/removeOnlyTestsThomas Huang2018-06-291-1/+1
| |\ \ \ | | | | | | | | | | Remove .only on test
| | * | | Remove .only on testtmashuang2018-06-271-1/+1
| | |/ /
| * | | Merge pull request #4677 from MetaMask/customize-gas-loading-waitDan J Miller2018-06-284-6/+79
| |\ \ \ | | | | | | | | | | Only show the customize gas modal if the estimateGas call is not currently in flight.
| | * | | Only show the customize gas modal if the estimateGas call is not currently ↵Dan2018-06-194-6/+79
| | | | | | | | | | | | | | | | | | | | in flight.
| * | | | Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancementsDan J Miller2018-06-287-41/+74
| |\ \ \ \ | | |_|/ / | |/| | | [new-ui] Improve ENS input errors and update ens validation on network change
| | * | | Remove commented out code in ens-input.Dan2018-06-221-1/+0
| | | | |
| | * | | Merge branch 'develop' into i4409-i4410-ens-input-enhancementsDan2018-06-2056-6786/+7086
| | |\ \ \
| | * | | | ENS input in send form shows distinct errors for invalid addresses and ↵Dan2018-06-157-22/+46
| | | | | | | | | | | | | | | | | | | | | | | | non-existent addresses.
| | * | | | ENS name revalidates on network change.Dan2018-06-131-23/+33
| | | | | |
| * | | | | Merge pull request #4627 from TrejGun/gas-fee-displayDan J Miller2018-06-278-57/+121
| |\ \ \ \ \ | | | | | | | | | | | | | | refactor gas-fee-display component
| | * | | | | fix default importtrejgun2018-06-232-2/+2
| | | | | | |
| | * | | | | linttrejgun2018-06-212-3/+13
| | | | | | |
| | * | | | | refactor gas-fee-display componenttrejgun2018-06-218-57/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | #4622
| * | | | | | Merge pull request #4649 from hermanjunge/developThomas Huang2018-06-231-0/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | License Edit
| | * | | | | LicenseHerman Junge2018-06-231-0/+1
| |/ / / / /
| * | | | | Merge pull request #4592 from vittominacori/fix/close-popup-bug-#4553Thomas Huang2018-06-211-2/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | set an id to the metamask notification popup
| | * | | | | set the popup id returned by create promisevittominacori2018-06-181-3/+4
| | | | | | |
| | * | | | | set an id to the metamask notification popupvittominacori2018-06-171-1/+2
| | |/ / / /
| * | | | | Merge pull request #4575 from whymarrh/token-amount-overflowWhymarrh Whitby2018-06-218-16/+35
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Handle token amount overflows
| | * | | | Accept whitespace when matching token balances in e2e testsWhymarrh Whitby2018-06-212-7/+8
| | | | | |
| | * | | | Add explicit timeout for add token testWhymarrh Whitby2018-06-211-1/+1
| | | | | |
| | * | | | Scroll large amounts in the send componentWhymarrh Whitby2018-06-212-4/+6
| | | | | |
| | * | | | Handle large token balances in tx list heroWhymarrh Whitby2018-06-214-5/+21
| |/ / / /
| * | | | Merge pull request #4612 from MetaMask/changelog-4.8.0-fixThomas Huang2018-06-201-1/+0
| |\ \ \ \ | | |_|_|/ | |/| | | changelog - remove incorrect entry
| | * | | changelog - remove incorrect entrykumavis2018-06-201-1/+0
| |/ / / | | | | | | | | 4.8.0 claimed dapp autoreload was disabled. Actually this was reverted and is still active at this time
| * | | Merge pull request #4605 from MetaMask/masterThomas Huang2018-06-192-7/+11
| |\ \ \ | | | | | | | | | | Merge Master into Develop
| | * \ \ Merge pull request #4603 from MetaMask/v4.8.0kumavis2018-06-19222-8310/+15077
| | |\ \ \ | | | | | | | | | | | | V4.8.0
| | | * | | Update ChangelogThomas2018-06-191-6/+1
| | | | | |
| | | * | | Merge branch 'develop' into v4.8.0Thomas2018-06-1923-62/+283
| | | |\ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #4602 from MetaMask/notice-controller-fixv4.8.0Thomas Huang2018-06-191-3/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | notice controller - properly show new notices for non-new users
| | * | | | | notice controller - properly show new notices for non-new userskumavis2018-06-191-3/+6
| | | | | | |
| * | | | | | Merge pull request #4582 from MetaMask/fixEmailLinkkumavis2018-06-191-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix email link in phishing notice
| | * | | | | | Fix email link in phishing noticeThomas2018-06-151-1/+1
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #4584 from MetaMask/fix-send-tokenkumavis2018-06-1912-21/+142
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Add hex-prefix to gas estimate result
| | * | | | | Update integration tests for newui gas estimation fixes.Dan2018-06-191-2/+2
| | | | | | |
| | * | | | | On send screen amount change, updateGas call now includes current to address.Dan2018-06-196-4/+37
| | | | | | |
| | * | | | | Send screen returns simple gas cost if no to address specified when not ↵Dan2018-06-192-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sending token.
| | * | | | | Remove leading zeroes from send screen amount row input.Dan2018-06-191-1/+5
| | | | | | |
| | * | | | | Fix currency-display.js rendering of token amounts.Dan2018-06-191-0/+1
| | | | | | |
| | * | | | | Revert to updating amount on blur of input change; update gas on blur of ↵Dan2018-06-192-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | amount input change; validate onchange.
| | * | | | | Fix unit testsAlexander Tseung2018-06-161-3/+8
| | | | | | |
| | * | | | | Estimate gas limit when the token amount changes. Fix amount inputAlexander Tseung2018-06-164-16/+18
| | | | | | |
| | * | | | | Update send.utils.js estimateGas tests.Dan2018-06-152-5/+20
| | | | | | |
| | * | | | | Add a buffer to new ui gas estimatesDan2018-06-152-2/+52
| | | | | | |
| | * | | | | Add hex-prefix to gas estimate resultAlexander Tseung2018-06-152-4/+4
| | |/ / / /
| * | | | | Merge pull request #4586 from MetaMask/block-idex-phisherkumavis2018-06-193-15/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | Add apparent phishing address to block list
| | * | | | | lint - fix recipient-blacklist.jskumavis2018-06-161-13/+13
| | | | | | |
| | * | | | | blacklist - recipient blacklist as js for inline commentskumavis2018-06-162-2/+2
| | | | | | |
| | * | | | | Update recipient-blacklist-config.jsonkumavis2018-06-161-0/+2
| | | | | | |
| | * | | | | Add apparent phishing address to block listDan Finlay2018-06-151-0/+1
| | |/ / / / | | | | | | | | | | | | In [this reddit post](https://www.reddit.com/r/Metamask/comments/8r3nsu/help_me_please_somebody_stole_my_ethers/) a user suggests they got some ether stolen after visiting IDEX. Their ether was sent to [this address](https://etherscan.io/address/0x9bcb0a9d99d815bb87ee3191b1399b1bcc46dc77), which is full of comments of people telling similar stories of being phished on IDEX. I think we can safely block this, and probably safe some people some money.
| * | | | | View address of an added token (#4591)Csaba S2018-06-193-22/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adding menu actions for tokens * apply common style
| * | | | | Merge pull request #4585 from MetaMask/ReenableDappReloadDan Finlay2018-06-173-1/+67
| |\ \ \ \ \ | | |/ / / / | |/| | | | Re-enable dapp reload on network change
| | * | | | Re-enable dapp reload on network changeDan Finlay2018-06-153-1/+67
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | We want to give devs some time to digest [this blog post](https://medium.com/metamask/breaking-change-no-longer-reloading-pages-on-network-change-4a3e1fd2f5e7) before we making a breaking change to our platform. Makes it easy to re-implement the change.
| | | * / v4.8.0Thomas2018-06-152-8/+10
| | |/ / | |/| |
| * | | Merge pull request #4524 from MetaMask/save-braveThomas Huang2018-06-152-3/+18
| |\ \ \ | | | | | | | | | | Save Brave Fixes #4270
| | * \ \ Merge branch 'develop' into save-bravekumavis2018-06-1539-6789/+6857
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #4571 from MetaMask/disable-diagnosticsDan Finlay2018-06-151-8/+0
| |\ \ \ \ | | | | | | | | | | | | diagnostics - temporarily disable
| | * | | | diagnostics - temporarily disablekumavis2018-06-141-8/+0
| | | | | |
| * | | | | Merge pull request #4566 from MetaMask/notice-phishingDan Finlay2018-06-1523-183/+140
| |\ \ \ \ \ | | | | | | | | | | | | | | Push new notice on recent phishing incidents
| | * | | | | test - e2e-beta - from import - handle phishing warningkumavis2018-06-141-8/+21
| | | | | | |
| | * | | | | test - e2e-beta - separate notice tests into individual testskumavis2018-06-141-1/+5
| | | | | | |
| | * | | | | test - e2e - clear phishing warningkumavis2018-06-142-1/+7
| | | | | | |
| | * | | | | notice-controller - update memStore on bootkumavis2018-06-141-0/+1
| | | | | | |
| | * | | | | test - e2e - check for phishing warningkumavis2018-06-144-15/+29
| | | | | | |
| | * | | | | notices - replace getLatestNotice with getNextNoticekumavis2018-06-1412-97/+39
| | | | | | |
| | * | | | | notices - notices collection is now manually editedkumavis2018-06-147-65/+35
| | | | | | |
| | * | | | | Add changelog item.Kevin Serrano2018-06-141-0/+1
| | | | | | |
| | * | | | | Add phishing notice.Kevin Serrano2018-06-143-2/+8
| | |/ / / /
| * | | | | Merge pull request #4513 from MetaMask/ValidateEmptyKeykumavis2018-06-145-18/+77
| |\ \ \ \ \ | | | | | | | | | | | | | | Validate empty key
| | * \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-06-14204-1737/+8267
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | ValidateEmptyKey
| * | | | | | Merge pull request #4570 from MetaMask/persistence-stream-fixkumavis2018-06-143-6/+33
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | background - persistence pipeline - fix persistence bug
| | * | | | | | changelog - add note on persistence bugkumavis2018-06-141-0/+1
| | | | | | | |
| | * | | | | | background - persistence pipeline - fix persistence bugkumavis2018-06-142-6/+32
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #4550 from MetaMask/bmd/sign-warning-helplinkbobby dresser2018-06-142-1/+14
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | add help link to eth_sign warning
| | * | | | | add help link to eth_sign warningBobby Dresser2018-06-122-1/+14
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #4560 from MetaMask/nonce-tracker-mutex-fixKevin Serrano2018-06-141-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | changelog - add note on nonce-lock mutex fix
| | * \ \ \ \ Merge branch 'develop' into nonce-tracker-mutex-fixkumavis2018-06-135-6532/+6544
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | changelog - add note on nonce-lock mutex fixkumavis2018-06-131-0/+1
| | | | | | |
| | | | * | | account-import-strategies - ensure privateKey is prefixed before converting ↵kumavis2018-06-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to buffer
| | | | * | | test - unit - add assertRejects to test asyncFnskumavis2018-06-142-5/+23
| | | | | | |
| | | | * | | test - unit - import strategies - properly await async methodskumavis2018-06-141-8/+8
| | | | | | |
| | | | * | | Make account import tests much more specificDan Finlay2018-06-123-6467/+6530
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | However, they no longer seem to work. I'm unclear why this test is failing. The private key being provided should be valid.
| | | | * | | Improve private key import testsDan Finlay2018-06-081-1/+25
| | | | | | |
| | | | * | | Improve test formattingDan Finlay2018-06-081-16/+19
| | | | | | |
| | | | * | | Bump changelogDan Finlay2018-06-061-0/+1
| | | | | | |
| | | | * | | Add validation for importing empty private keyDan Finlay2018-06-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously importing an empty string would result in a new empty Keyring object to be constructed, with no notification to the user. Now we render a clear error explaining the mistake.
| | | | | * | Handle brave throwsDan Finlay2018-06-151-3/+11
| | | | | | |
| | | | | * | changelog - version fixkumavis2018-06-091-2/+0
| | | | | | |
| | | | | * | changelog 4270Jenny Pollack2018-06-081-0/+3
| | | | | | |
| | | | | * | Merge branch 'develop' into save-braveJenny Pollack2018-06-08186-1530/+8026
| | | | | |\ \
| | | | | * | | lintJenny Pollack2018-06-071-1/+1
| | | | | | | |
| | | | | * | | remove loglevelJenny Pollack2018-06-071-2/+1
| | | | | | | |
| | | | | * | | preferred first languauge - check for BraveJenny Pollack2018-06-071-8/+5
| | | | | | | |
| | | | | * | | first language - add check for brave browser on getAcceptLanguagesJenny Pollack2018-06-071-1/+11
| | | | | | | |
* | | | | | | | use latest eth-trezor-keyringbrunobar792018-06-262-2/+2
| | | | | | | |
* | | | | | | | fixesbrunobar792018-06-233-6552/+6543
| | | | | | | |
* | | | | | | | point to new version of eth-trezor-keyringbrunobar792018-06-231-1/+1
| | | | | | | |
* | | | | | | | clean upBruno2018-06-131-16/+19
| | | | | | | |
* | | | | | | | fix merge conflictsBruno2018-06-1312-125/+146
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge branch 'develop' of git://github.com/Metamask/metamask-extension into ↵Bruno2018-06-1312-6576/+6595
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop
| | * | | | | | | Merge pull request #4558 from MetaMask/stop-reload-on-network-changeDan Finlay2018-06-133-65/+20
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Stop reload on network change
| | | * \ \ \ \ \ \ Merge branch 'develop' into stop-reload-on-network-changeErik Marks2018-06-13172-7992/+14314
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge pull request #4557 from MetaMask/nonce-tracker-mutex-fixkumavis2018-06-134-40/+47
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | Bug: Mutex locks not released on error
| | | * | | | | | | controllers - transaction - prefer log over consolekumavis2018-06-131-2/+2
| | | | | | | | | |
| | | * | | | | | | metamask - ensure all nonce locks are releasedkumavis2018-06-134-17/+18
| | | | | | | | | |
| | | * | | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on errorkumavis2018-06-131-22/+28
| | | | | | | | | |
| | * | | | | | | | Merge pull request #4556 from MetaMask/WatchTestReloadDan Finlay2018-06-132-6468/+6525
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | Add script for auto-re-running unit tests on changes
| | | * | | | | | | Add script for auto-re-running tests on changeDan Finlay2018-06-132-6468/+6525
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `npm run watch:test:unit` will re-run the unit test suite whenever a file in `app`, `ui`, or `test` changes.
| | * | | | | | | Merge pull request #4554 from whymarrh/fix-e2e-profile-pathWhymarrh Whitby2018-06-131-1/+1
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | Fix temp Chrome profile path used for e2e tests
| | | * | | | | | Fix e2e test Chrome profile pathsWhymarrh Whitby2018-06-131-1/+1
| | |/ / / / / /
| | * | | | | | Merge pull request #4535 from MetaMask/i4508-fix-gas-edit-confirm-screenDan J Miller2018-06-112-2/+2
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | Fix gas limit editing on confirm screen
| | | * | | | | Access correct property from state in confirm screen components gatherTxMeta()Dan2018-06-082-2/+2
| | |/ / / / /
| | | * | | | update changelogErik Marks2018-06-131-0/+3
| | | | | | |
| | | * | | | undo package.json and package-lock.json changesErik Marks2018-06-132-6817/+6539
| | | | | | |
| | | * | | | removed auto-reload.js, moved global web3 export to inpage.jsErik Marks2018-06-132-43/+16
| | | | | | |
| | | * | | | wipErik Marks2018-06-134-6580/+6839
| | | | | | |
| * | | | | | Merge branch 'develop' of https://github.com/brunobar79/metamask-extension ↵Bruno2018-06-130-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | into develop
| | * | | | | Merge remote-tracking branch 'upstream/develop' into developBruno2018-06-0667-317/+841
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into developBruno2018-05-31149-17174/+5990
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into developBruno2018-05-1797-3419/+8695
| | |\ \ \ \ \ \ \
* | | | | | | | | | upgrade eth-trezor-keyringBruno2018-06-131-1/+1
| | | | | | | | | |
* | | | | | | | | | move TrezorKeyring to its own packageBruno2018-06-136-1383/+53
| | | | | | | | | |
* | | | | | | | | | added support for signPersonalMessageBruno2018-06-131-28/+45
| | | | | | | | | |
* | | | | | | | | | clean upBruno2018-06-111-92/+21
| | | | | | | | | |
* | | | | | | | | | sign transactions is pretty closeBruno2018-06-111-49/+77
| | | | | | | | | |
* | | | | | | | | | balances workingBruno2018-06-113-6/+22
| | | | | | | | | |
* | | | | | | | | | add account workingBruno2018-06-112-8/+13
| | | | | | | | | |
* | | | | | | | | | clean upBruno2018-06-112-8/+15
| | | | | | | | | |
* | | | | | | | | | initial trezor supportBruno2018-06-1014-6478/+8369
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4523 from MetaMask/i4462-FixResetBugDan Finlay2018-06-083-6/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix bug where reset account would not work.
| * | | | | | | | | Fix bug where reset account would not work.Dan Finlay2018-06-073-6/+12
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4462 Ensures that resetAccount() can work on non-stock providers. I'm unclear how this was ever working, this code hasn't moved in months, but users report it recently breaking. Maybe we only recently pushed it to prod.
* | | | | | | | | Merge pull request #4090 from MetaMask/i3725-refactor-send-component-Dan J Miller2018-06-07163-1349/+7527
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | I3725 Refactor Send Component
| * | | | | | | | | Bump beta e2e timeouts on faucet page.Dan2018-06-072-4/+4
| | | | | | | | | |
| * | | | | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-077-141/+218
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #4385 from MetaMask/ci-test-e2e-betakumavis2018-06-076-141/+217
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | CI - Add e2e-beta tests
| * | | | | | | | | Improve e2e beta tests by adding appropriate waits.Dan2018-06-072-47/+56
| | | | | | | | | |
| * | | | | | | | | Conditionally close info page in beta e2e tests.Dan2018-06-062-4/+14
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'whymarrh/ci-test-e2e-beta' into ci-test-e2e-betaDan2018-06-062-63/+79
| | | | | | | | | |
| * | | | | | | | | Fix e2e beta tests to account for add-token updates and actual behaviour of ↵Dan2018-06-062-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tab openings on installation.
| * | | | | | | | | Merge branch 'develop' into ci-test-e2e-betaDan2018-06-0629-70/+452
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Adjust delays in new beta e2e testsWhymarrh Whitby2018-06-021-2/+2
| | | | | | | | | |
| * | | | | | | | | ci - breakout firefox helpers into scriptskumavis2018-06-023-23/+19
| | | | | | | | | |
| * | | | | | | | | ci - run e2e:beta testskumavis2018-06-021-4/+53
| | | | | | | | | |
* | | | | | | | | | Merge pull request #4477 from MetaMask/i3073-block-gravityformskumavis2018-06-071-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Block gravityforms.com from web3 injection
| * | | | | | | | | | Block gravityforms.com from web3 injectionDan Finlay2018-06-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3073
| | | | * | | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-0733-131/+394
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #4512 from MetaMask/test-metamask-no-diagnosticsThomas Huang2018-06-071-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | test - metamask-controller - disable diagnostics
| * | | | | | | | | | | test - metamask-controller - disable diagnosticskumavis2018-06-061-0/+3
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #4414 from scsaba/recipient-blacklistkumavis2018-06-075-1/+137
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Disallow sending to ganache default accounts on main net
| * | | | | | | | | | | remove generating blocked accounts and use a config file insteadCsaba Solya2018-05-314-29/+30
| | | | | | | | | | | |
| * | | | | | | | | | | fix documentationCsaba Solya2018-05-301-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | adding tests for recipient blacklist checkerCsaba Solya2018-05-303-5/+83
| | | | | | | | | | | |
| * | | | | | | | | | | adding transaction controller testsCsaba Solya2018-05-302-1/+18
| | | | | | | | | | | |
| * | | | | | | | | | | initial implementationCsaba Solya2018-05-302-1/+41
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4418 from MetaMask/handle-import-account-failure-in-uikumavis2018-06-074-19/+47
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Handle errors for null selected address after Importing account (json or private key)
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-0523-60/+366
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-0347-282/+458
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix then-catch + error handling in import-accountDan2018-05-312-4/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Importing account by json and private key shows error and does not change ↵Dan2018-05-314-16/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | account if no selectedAddress comes after import.
* | | | | | | | | | | | | | Merge pull request #4514 from whymarrh/account-label-type-checkkumavis2018-06-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add account type assertion to PreferencesController#setAccountLabel
| * | | | | | | | | | | | | | Add account type assertion to PreferencesController#setAccountLabelWhymarrh Whitby2018-06-061-0/+1
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | i18n - ja improvements03-262018-06-077-18/+75
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #4515 from MetaMask/masterThomas Huang2018-06-072-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | Merge Master into Develop
| * | | | | | | | | | | | Merge pull request #4511 from MetaMask/v4.7.4kumavis2018-06-068-49/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 4.7.4
| | * | | | | | | | | | | | 4.7.4v4.7.4kumavis2018-06-062-1/+6
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into v4.7.4kumavis2018-06-062-2/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| / / / / / / / / / / / | | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #4490 from MetaMask/v4.7.3Thomas Huang2018-06-0520-41/+293
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 4.7.3
| | * | | | | | | | | | | | changelog - add note on new modalv4.7.3kumavis2018-06-051-0/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into v4.7.3kumavis2018-06-053-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | 4.7.3kumavis2018-06-052-2/+6
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #4507 from whymarrh/fix-account-orderDan J Miller2018-06-0710-45/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | Render accounts in keyring order
| * | | | | | | | | | | | | Fix mock addresses used for integration testsWhymarrh Whitby2018-06-066-18/+18
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix account list order for the old UIWhymarrh Whitby2018-06-061-2/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Render the accounts in keyring orderWhymarrh Whitby2018-06-061-3/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove unused identities reducer from UIWhymarrh Whitby2018-06-062-22/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #4509 from whymarrh/wallet-view-assertionkumavis2018-06-061-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit selectedAddress assertion to the wallet view
| * | | | | | | | | | | | | Remove selectedIdentity prop from wallet viewWhymarrh Whitby2018-06-061-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The selectedIdentity property is computed based on the selectedAddress which means that using both the selectedAddress and the selectedIdentity is redundant. In the case of the Array#find call on the set of keyrings, we wouldn't have a situation where one is included and the other isn't. This changeset removes the selectedIdentity from the wallet view because it isn't needed.
| * | | | | | | | | | | | | Ensure selectedAddress exists when render walletWhymarrh Whitby2018-06-061-0/+4
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #4506 from MetaMask/diagnostics-multivaultkumavis2018-06-065-43/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | diagnostics - add multiple vault detection to diagnostics reporting
| * | | | | | | | | | | | diagnostics - fix reportMultipleKeyrings callkumavis2018-06-061-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | diagnostics - minor fixeskumavis2018-06-062-5/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | lint - fix diagnostics reporterkumavis2018-06-061-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | diagnostics - rewrite bug-notifier as diagnostics-reporterkumavis2018-06-065-71/+84
| | | | | | | | | | | | |
| * | | | | | | | | | | | add multivault detection to diagnostics reportingkumavis2018-06-061-0/+33
|/ / / / / / / / / / / /
| | | | | | | | * | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-0529-72/+400
| | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Update hide-token-confirmation-modal.js to use new modalState schema (#4482)Dan J Miller2018-06-053-3/+3
| |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update hide-token-confirmation-modal.js to use new modalState schema (added in 41e38fe55). * Fix modalState props
* | | | | | | | | | | Merge pull request #4486 from MetaMask/i4475-ClearUnknownIdentitieskumavis2018-06-055-4/+135
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clear unknown identities
| * | | | | | | | | | | Record identity before deleting itDan Finlay2018-06-051-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Mock notifier in testDan Finlay2018-06-052-1/+7
| | | | | | | | | | | |