aboutsummaryrefslogtreecommitdiffstats
path: root/test
Commit message (Expand)AuthorAgeFilesLines
* Don't show an additional beta UI notificationWhymarrh Whitby2018-07-282-9/+1
* New ui e2e tests switch to localhost provider (needed after new ui selection ...Dan Miller2018-07-282-0/+20
* Fix integration tests to accomodate new ui suggestion screen changes.Dan Miller2018-07-281-0/+5
* Fix e2e tests to accomodate new ui suggestion screen changes.Dan Miller2018-07-283-57/+83
* Updates e2e beta tests to ensure that popup window closes after confirming a ...Dan Miller2018-07-241-1/+1
* Merge branch 'develop' into detectTokenFeatureEsteban Miño2018-07-2118-299/+816
|\
| * Auto-detect tokens #3034 (#4683)Esteban Miño2018-07-211-0/+120
| * Merge pull request #4625 from MetaMask/initial-trezor-supportBruno Barbieri2018-07-203-0/+228
| |\
| | * fix browser not supported screenbrunobar792018-07-181-1/+1
| | * added some e2e testsbrunobar792018-07-181-0/+47
| | * Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-181-2/+2
| | |\
| | * | added tests for removeAccountbrunobar792018-07-171-0/+33
| | * | added more unit testsbrunobar792018-07-171-2/+55
| | * | added unit tests for metamaskcontrollerbrunobar792018-07-171-0/+70
| | * | added test for preferences controllerbrunobar792018-07-171-0/+25
| * | | Fix testsAlexander Tseung2018-07-182-75/+8
| | |/ | |/|
| * | Increase clickable area and padding of Retry Transaction barAlexander Tseung2018-07-171-2/+2
| |/
| * fix tos link;Bobby Dresser2018-07-131-1/+1
| * Merge pull request #4691 from MetaMask/i4404-confirm-refactorAlexander Tseung2018-07-129-207/+501
| |\
| | * Wait for an element with a .tx-list-pending-item-container to be rendered bef...Dan2018-07-121-0/+2
| | * Reattempt to find network selector; wait for network selector dropdown to con...Dan2018-07-121-3/+6
| | * Wait for submitted tx list item amounts to match the expected before clicking...Dan2018-07-121-5/+6
| | * Fix bug in test mock signature request methods.Dan2018-07-122-0/+3
| | * Fix send integration tests for compatability with confirm refactor.Dan2018-07-111-7/+7
| | * Fix signature request tests for compatability with confirm refactor.Dan2018-07-111-7/+5
| | * Update e2e beta tests to cover confirm refactor changes.Dan2018-07-113-4/+155
| | * Fix existing e2e testsDan2018-07-111-11/+26
| | * Handles window indeterminancy issues for external dapps in e2e beta tests.Dan2018-07-114-114/+255
| | * Fix existing unit testsAlexander Tseung2018-07-081-61/+41
| * | test - check that #setTxStatusRejected removes transaction from historyfrankiebee2018-07-111-0/+9
| * | test - fix for lintfrankiebee2018-07-111-5/+5
| * | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...frankiebee2018-07-1146-555/+837
| |\|
| | * Merge pull request #4648 from MetaMask/update-import-from-seed-screenDan J Miller2018-07-061-3/+6
| | |\
| | | * Update import from seed screen on new ui.Dan2018-07-051-3/+6
| | * | Merge pull request #4685 from MetaMask/estimate-gasprice-background-newuiDan J Miller2018-07-051-12/+1
| | |\ \ | | | |/ | | |/|
| | | * Update new-ui-send integration tests to always explicitly set gas price. (e2e...Dan2018-07-051-12/+1
| * | | tests - fix cancle transaction test to better fit new behaviorfrankiebee2018-06-272-13/+10
| * | | woops - remove .onlyfrankiebee2018-06-261-1/+1
| * | | trandsactions - remove rejected transactions from historyfrankiebee2018-06-261-0/+14
| * | | migration 27 - remove rejected transactions from statefrankiebee2018-06-261-0/+50
* | | | fix detection on submit passwordEsteban MIno2018-07-211-6/+27
* | | | keyring unlocked detect and unit testsEsteban MIno2018-07-201-6/+32
* | | | detect tokens when submit password and new account selectedEsteban MIno2018-07-201-4/+4
* | | | detect tokens through infuraEsteban MIno2018-07-131-9/+17
* | | | improve testsEsteban MIno2018-07-121-56/+49
* | | | fix lintEsteban MIno2018-07-041-54/+46
* | | | Merge branch 'develop' into detectTokenFeatureEsteban MIno2018-07-0446-542/+832
|\ \ \ \ | | |/ / | |/| |
| * | | fix contract-testbrunobar792018-07-031-3/+7
| * | | fix unit testsbrunobar792018-07-031-4/+3
| * | | fix testsbrunobar792018-07-032-6/+12
| * | | fix warning for new-ui screen testsbrunobar792018-07-031-4/+2
| * | | fix warning for unit testsbrunobar792018-07-0314-68/+35
| * | | fix test/mascara.conf.js warningsbrunobar792018-07-031-1/+1
| * | | fix warnings for integration testsbrunobar792018-07-033-7/+1
| * | | fix warnings for e2e testsbrunobar792018-07-033-10/+8
| * | | eslint --fix .brunobar792018-07-0339-273/+271
| * | | Improve checks for closing info page on app installation in e2e beta tests.Dan2018-06-291-5/+11
| | |/ | |/|
| * | Use supersonic instead of httpserver to serve local dapp (e2e beta tests)Dan2018-06-281-2/+2
| * | Turn off failing e2e beta assertion in firefox until bugs in webdriver/geckod...Dan2018-06-281-2/+6
| * | Update condition for backspace in customize gas step of token factory send te...Dan2018-06-281-1/+4
| * | 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 / we...Dan2018-06-271-1/+8
| * | 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-275-174/+130
| * | 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-271-5/+18
| * | Speed up page opening and fix timeout errors on remix page opening in beta e2...Dan2018-06-272-13/+26
| * | 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
| * | 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 metamask.sp...Dan2018-06-271-3/+8
| * | 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 cer...Dan2018-06-272-5/+12
| * | Add test for importing from private key to from-import-beta-ui.spec.js, and r...Dan2018-06-272-125/+19
| * | 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
| |/
* / tests for specEsteban MIno2018-06-281-0/+101
|/
* 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
* Update integration tests for newui gas estimation fixes.Dan2018-06-191-2/+2
* Merge pull request #4566 from MetaMask/notice-phishingDan Finlay2018-06-154-67/+62
|\
| * 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
| * test - e2e - check for phishing warningkumavis2018-06-142-13/+27
| * notices - replace getLatestNotice with getNextNoticekumavis2018-06-141-46/+4
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into Validat...kumavis2018-06-148-129/+252
|\|
| * Fix e2e test Chrome profile pathsWhymarrh Whitby2018-06-131-1/+1
| * Bump beta e2e timeouts on faucet page.Dan2018-06-072-4/+4
| * Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-073-119/+150
| |\
| | * Merge pull request #4385 from MetaMask/ci-test-e2e-betakumavis2018-06-073-119/+150
| | |\
| | | * 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 t...Dan2018-06-062-14/+10
| | | * Merge branch 'develop' into ci-test-e2e-betaDan2018-06-061-3/+28
| | | |\
| | | * | Adjust delays in new beta e2e testsWhymarrh Whitby2018-06-021-2/+2
| * | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-073-5/+97
| |\| | |
| | * | | Merge pull request #4512 from MetaMask/test-metamask-no-diagnosticsThomas Huang2018-06-071-0/+3
| | |\ \ \
| | | * | | test - metamask-controller - disable diagnosticskumavis2018-06-061-0/+3
| | | | |/ | | | |/|
| | * | | Merge pull request #4414 from scsaba/recipient-blacklistkumavis2018-06-072-0/+94
| | |\ \ \ | | | |/ / | | |/| |
| | | * | remove generating blocked accounts and use a config file insteadCsaba Solya2018-05-311-11/+10
| | | * | adding tests for recipient blacklist checkerCsaba Solya2018-05-301-0/+78
| | | * | adding transaction controller testsCsaba Solya2018-05-301-0/+17
| | * | | diagnostics - rewrite bug-notifier as diagnostics-reporterkumavis2018-06-061-5/+0
| * | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-051-3/+33
| |\| | |
| * | | | Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-e...Dan2018-06-0110-23/+997
| |\ \ \ \
| | * \ \ \ Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask...Dan2018-06-011-3/+3
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Fix send amount field select in send-new-ui integration test.Dan2018-06-011-1/+1
| | | * | | Fix send-new-ui gas fee display expectation.Dan2018-06-011-1/+1
| | | * | | Fix currency display send integration tests.Dan2018-05-311-1/+1
| * | | | | Fix test to account for greater precision currency display.Dan2018-05-311-1/+1
| | |/ / / | |/| | |
| * | | | Clean up for send refactor PR.Dan2018-05-251-2/+1
| * | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-2447-2266/+1366
| |\ \ \ \
| * | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-154-21/+21
| * | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-1418-377/+945
| * | | | | Further refactors; includes refactor of send-v2.js and associated containerDan2018-04-301-1/+2
* | | | | | 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-121-10/+10
* | | | | | Improve private key import testsDan Finlay2018-06-081-1/+25
* | | | | | Improve test formattingDan Finlay2018-06-081-16/+19
| |_|_|/ / |/| | | |
* | | | | Mock notifier in testDan Finlay2018-06-051-0/+5
* | | | | Add failing test for unknown identity entryDan Finlay2018-06-051-3/+28
| |_|/ / |/| | |
* | | | Add new alert modalsAlexander Tseung2018-06-014-12/+12
* | | | Delay before getting address textThomas2018-05-301-0/+1
* | | | Merge branch 'develop' into e2e-testThomas2018-05-301-6/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | ci - job-screens - use e2e funcskumavis2018-05-301-6/+4
* | | | Add accountThomas2018-05-301-0/+6
|/ / /
* | / Add basic e2e tests for the new UIWhymarrh Whitby2018-05-255-2/+971
| |/ |/|
* | Merge pull request #4321 from MetaMask/testingkumavis2018-05-2335-1556/+690
|\ \
| * \ Merge branch 'develop' into testingtmashuang2018-05-221-30/+0
| |\ \
| * \ \ Merge branch 'develop' into testingtmashuang2018-05-227-1746/+214
| |\ \ \
| * \ \ \ Merge branch 'develop' into testingtmashuang2018-05-223-364/+81
| |\ \ \ \
| * | | | | Moved loose some loose test files to sub folderstmashuang2018-05-2129-59/+108
| * | | | | signMessage and signPersonalMessageThomas2018-05-181-13/+33
| * | | | | Merge branch 'develop' into testingThomas2018-05-174-90/+134
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into testingThomas2018-05-177-163/+670
| |\ \ \ \ \ \
| * | | | | | | console.log -> assert.equalThomas2018-05-091-1/+1
| * | | | | | | ImportAccountWithStrategies Json and KeystoreThomas2018-05-091-0/+30
| * | | | | | | Remove approvePersonalMessage testThomas2018-05-081-45/+0
| * | | | | | | Merge branch 'develop' into testingThomas2018-05-0812-224/+324
| |\ \ \ \ \ \ \
| * | | | | | | | setupUntrustedCommunication and setupTrustedCommunicationThomas2018-04-251-0/+45
| * | | | | | | | Merge branch 'master' into testingThomas2018-04-247-5/+129
| |\ \ \ \ \ \ \ \
| * | | | | | | | | ConfigManager markAccountsFound, markPasswordForgotten, unMarkPasswordForgottenThomas2018-04-241-7/+70
| * | | | | | | | | resetAccount and addNewAccountThomas2018-04-201-0/+45
| * | | | | | | | | newUnsignedMessage and newUnsignedPersonalMessageThomas2018-04-191-0/+102
| * | | | | | | | | Merge branch 'master' into testingThomas2018-04-1113-50/+519
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | MM-controlller testsThomas2018-04-111-2/+55
| * | | | | | | | | | Update Sinon methods. sinon.sandbox.create() -> sandbox.createSandbox()Thomas2018-04-057-8/+8
| * | | | | | | | | | Merge branch 'testing' of https://github.com/tmashuang/metamask-extension int...Thomas2018-04-033-7/+466
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Metamask controller methodsThomas2018-03-281-1/+146
| | * | | | | | | | | | Remove console.logThomas2018-03-281-1/+0
| | * | | | | | | | | | Update blacklistThomas2018-03-281-5/+320
* | | | | | | | | | | | Merge pull request #4333 from MetaMask/test-e2e-check-for-errorsThomas Huang2018-05-231-1/+33
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | test - e2e - only inspect console for errors in chromekumavis2018-05-221-6/+10
| * | | | | | | | | | | | test - e2e - ignore 'development build of Redux' warningkumavis2018-05-221-1/+3
| * | | | | | | | | | | | test - e2e - ignore 'development build of React' warningkumavis2018-05-221-0/+2
| * | | | | | | | | | | | test - e2e - ignore favicon 404skumavis2018-05-221-1/+6
| * | | | | | | | | | | | test - e2e - ignore react 'unknown props dataset' warningskumavis2018-05-221-2/+5
| * | | | | | | | | | | | test - e2e - check for console errors after each testkumavis2018-05-221-1/+17
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #4308 from MetaMask/i4232-addtokenkumavis2018-05-232-30/+44
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix testsAlexander Tseung2018-05-212-30/+44
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | ci - screens - continue screenshots through account creation + export accountkumavis2018-05-221-95/+130
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Reveal get filtered tx list (#4332)Frankie2018-05-221-30/+0
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #4034 from whymarrh/account-nicknameskumavis2018-05-226-50/+204
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Fix migration 026 to produce the correct shape for state.identitiesWhymarrh Whitby2018-05-181-2/+2
| * | | | | | | | | Update MetaMaskController vault restoration test for new KC apiWhymarrh Whitby2018-05-171-1/+1
| * | | | | | | | | Add migration to move identities from KeyringControllerWhymarrh Whitby2018-05-171-0/+41
| * | | | | | | | | Add test case for PreferencesController#setAccountLabelWhymarrh Whitby2018-05-171-0/+21
| * | | | | | | | | Add PreferencesController#setAddresses to update idsWhymarrh Whitby2018-05-171-0/+44
| * | | | | | | | | Update AddressBookController to read from preferences storeWhymarrh Whitby2018-05-171-13/+13
| * | | | | | | | | Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-173-36/+84
| |/ / / / / / / /
* | | | | | | | | Merge pull request #4278 from MetaMask/e2e-testskumavis2018-05-223-364/+81
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Adjustments for previous PRThomas2018-05-171-4/+4
| * | | | | | | | Testing timeoutsThomas2018-05-171-18/+18
| * | | | | | | | Merge branch 'develop' into e2e-testsThomas2018-05-153-14/+26
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge e2e tests into oneThomas2018-05-153-359/+77
* | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-...kumavis2018-05-178-188/+675
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-178-163/+700
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge pull request #4251 from whymarrh/e2e-fixesThomas Huang2018-05-152-4/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | e2e: Use the more reliable enter key for logging inWhymarrh Whitby2018-05-151-1/+1
| | | * | | | | | | | e2e: Wait a bit before clicking through privacy screenWhymarrh Whitby2018-05-151-0/+1
| | | * | | | | | | | e2e: Adjust the extension ID query for newer Chrome versionsWhymarrh Whitby2018-05-151-1/+1
| | | * | | | | | | | e2e: Use newest window as MM tx confirm popupWhymarrh Whitby2018-05-152-2/+2
| | * | | | | | | | | Add error message when passwords don't match in first time flow. Change input...Alexander Tseung2018-05-142-17/+16
| | |/ / / / / / / /
| | * / / / / / / / Add new unlock screen designAlexander Tseung2018-05-122-5/+18
| | |/ / / / / / /
| | * | | | | | | Increase timeoutThomas2018-05-111-1/+1
| | * | | | | | | Fix typoThomas2018-05-111-1/+1
| | * | | | | | | Job Screens with Shadow Dom Css selectorThomas2018-05-113-6/+7
| | * | | | | | | Multistep Shadow Dom Query Selector for local extension idThomas2018-05-111-10/+10
| | * | | | | | | Update test:screens to newest chrome extension listThomas2018-05-081-1/+1
| | * | | | | | | Merge branch 'develop' into e2e-testsThomas2018-05-081-0/+30
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Update to extension Id path for new chromeThomas2018-05-081-5/+5
| | * | | | | | | Remove waiting for button to be enabled TOUThomas2018-05-041-1/+0
| | * | | | | | | Merge branch 'e2e-tests' of https://github.com/tmashuang/metamask-extension i...Thomas2018-05-0413-226/+258
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add a comment on the confirmation transaction metamask popup showing blank, b...Thomas2018-05-041-0/+1
| | | * | | | | | | Quit chromedriver after testThomas2018-05-041-3/+3
| | | * | | | | | | Merge branch 'develop' into e2e-testsThomas2018-05-0411-223/+254
| | | |\ \ \ \ \ \ \
| | * | | | | | | | | Increase timeout for TOU scrollThomas2018-05-041-1/+1
| | |/ / / / / / / /
| | * | | | | | | | Reduce delay for installing firefox addonThomas2018-05-041-2/+1
| | * | | | | | | | Add Timeouts for driver.waitThomas2018-05-041-9/+8
| | * | | | | | | | Test wit driver.waitThomas2018-05-041-18/+21
| | * | | | | | | | Delay around the addon installThomas2018-05-021-2/+3
| | * | | | | | | | test increase timeoutThomas2018-05-021-1/+1
| | * | | | | | | | Async/await installing extensionThomas2018-05-021-4/+4
| | * | | | | | | | FirefoxThomas2018-05-024-147/+638
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | test - network controller - remove tests for deprecated APIs + update testskumavis2018-05-031-25/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | add time stamps to transaction history log entriesCsaba Solya2018-05-103-65/+129
| |_|/ / / / / |/| | | | | |
* | | | | | | transactions - add a nonce check utility for ui usefrankiebee2018-05-021-0/+30
|/ / / / / /
* | | | | | Merge pull request #4116 from MetaMask/test-unit-ganacheThomas Huang2018-05-013-16/+32
|\ \ \ \ \ \
| * | | | | | test - unit - send from test accounts to avoid not-enough-balance error from ...kumavis2018-04-282-12/+12
| * | | | | | test - unit - use ganache instead of deprecated block-tracker test utilkumavis2018-04-281-4/+20
* | | | | | | Verify identities state after restoring new accounts (#4091)Paul Bouchon2018-04-301-8/+25
|/ / / / / /
* | | | | | Merge pull request #4110 from MetaMask/masterkumavis2018-04-288-173/+164
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3kumavis2018-04-268-173/+164
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'master' into tx-controller-rewrite-v3frankiebee2018-04-209-20/+165
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | meta - transactions - code clean up and jsDocfrankiebee2018-04-141-2/+2
| | * | | | | meta - transactions - create a transactions dir in controller and move releva...frankiebee2018-04-118-171/+162
* | | | | | | Allow transactions with 0-gwei gas price (#4073)Paul Bouchon2018-04-271-26/+33
|/ / / / / /
* | / / / / Clean up network configAlexander Tseung2018-04-241-1/+41
| |/ / / / |/| | | |
* | | | | Merge pull request #3998 from MetaMask/i3988-checksummed-addressDan Finlay2018-04-191-1/+1
|\ \ \ \ \
| * | | | | Show checksummed addresses throughout the UIbitpshr2018-04-181-1/+1
* | | | | | Merge branch 'master' into i3580-InternationalizeCurrencyDan Finlay2018-04-183-0/+69
|\| | | | |
| * | | | | Disable token price polling when no client is activebitpshr2018-04-171-0/+1
| * | | | | Maintain token prices using a background servicebitpshr2018-04-161-0/+28
| * | | | | Add tests for ComposableObservableStorebitpshr2018-04-141-0/+35
| * | | | | Add ComposableObservableStore for subscription managementbitpshr2018-04-131-0/+5
| | |_|_|/ | |/| | |
* | | | | Add basic currency localization test.Dan2018-04-101-0/+28
* | | | | Fix integration tests so that they check for localize currency.Dan2018-04-101-4/+4
* | | | | Merge branch 'master' into i3580-InternationalizeCurrencyDan2018-04-1010-72/+261
|\| | | |
| * | | | Merge pull request #3921 from MetaMask/gh-3736-react-routerkumavis2018-04-103-15/+36
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix integration testsAlexander Tseung2018-04-072-15/+33
| | * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-065-11/+109
| | |\ \ \
| | * | | | Revert "commit"Alexander Tseung2018-04-063-17/+5
| | * | | | commitAlexander Tseung2018-04-063-5/+17