Commit Graph

6781 Commits

Author SHA1 Message Date
Thomas 54ccf5e930 Merge branch 'develop' into e2e-test 2018-05-29 22:34:17 -07:00
kumavis 77c55ecd83
Merge pull request #4403 from MetaMask/bugfix-keyring-controller
deps - bump eth-keyring-controller + update package-lock
2018-05-29 22:31:58 -07:00
kumavis 73afb263cb ci - job-screens - use e2e funcs 2018-05-29 22:13:58 -07:00
kumavis 4789e981c2
Merge pull request #4374 from MetaMask/test-unit-fail-on-only
test - unit - fail if tests contain a .only call
2018-05-29 21:40:28 -07:00
Alexander Tseung a19b911feb
Add rpc key to i18n messages (#4375) 2018-05-29 18:31:32 -07:00
Thomas f90ad6191c Add account 2018-05-29 18:20:54 -07:00
kumavis d6965c7cdb deps - bump eth-keyring-controller + update package-lock 2018-05-29 17:38:00 -07:00
kumavis ff6976b8a5
Merge pull request #4399 from MetaMask/merge-master
Pull master changes back into develop
2018-05-29 16:47:30 -07:00
kumavis 4205d92729 Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-master 2018-05-29 16:12:36 -07:00
kumavis 219cb83d94
Merge pull request #4394 from MetaMask/MissionStatement
Add mission statement v1
2018-05-29 14:32:05 -07:00
kumavis 39069710d1
Merge pull request #4390 from MetaMask/i18n-brave-fix
i18n - getFirstPreferredLangCode - guard against missing i18n api
2018-05-29 11:05:12 -07:00
kumavis 5fc24930a7
Merge pull request #4384 from antonper/master
UI Errors stack cleaned
2018-05-29 11:04:08 -07:00
Alexander Tseung 41e38fe553
Add notification for dropped retry transactions (#4363) 2018-05-29 10:23:06 -07:00
Alexander Tseung e3c9629130
Fix add-token token list placeholder width (#4365) 2018-05-29 10:03:08 -07:00
Dan Finlay 1333cd470b Mission v2 2018-05-29 09:30:59 -07:00
Dan Finlay 344f0f2eea Add mission statement v1 2018-05-29 09:27:02 -07:00
Alexander Tseung d1f5d8ccc6
Fix text field labels of first time flow. Add text fields to storybook (#4389) 2018-05-29 09:35:18 -05:00
kumavis c665fe191d
Merge pull request #4393 from MetaMask/newui-unlock-catch
newui - unlock - dont catch errors unrelated to tryUnlockMetamask
2018-05-28 23:52:19 -07:00
kumavis 76c5851df1
Merge pull request #4391 from MetaMask/newui-imported-accounts-select-fix
metamask-controller - update preferences controller addresses after import account
2018-05-28 23:51:59 -07:00
kumavis a7b7c8f034 newui - unlock - dont catch errors unrelated to tryUnlockMetamask 2018-05-28 23:34:40 -07:00
kumavis 7e87600042
metamask-controller - lint fix 2018-05-28 23:14:38 -07:00
kumavis 09601439e3 metamask-controller - update preferences controller addresses after import account 2018-05-28 23:00:22 -07:00
kumavis e3ecc94a52
i18n - getFirstPreferredLangCode - guard against missing i18n api
fix for brave
2018-05-28 21:50:23 -07:00
Anton 71a6e97327 cleanErrorStack moved to separate library module
more errors traces cleaned up
2018-05-28 22:57:08 +02:00
kumavis 12492aae60
Merge pull request #4373 from whymarrh/new-ui-e2e
Basic end-to-end (e2e) tests for the new UI
2018-05-28 09:17:22 -07:00
Anton 1d23a5c81b error message fix 2018-05-28 18:08:33 +02:00
Anton 62dc6e20eb Clean up user rejection error message 2018-05-28 17:57:45 +02:00
kumavis 1cd4b03b37 test - unit - fail if tests contain a .only call 2018-05-25 12:58:16 -07:00
Whymarrh Whitby 715624227a Add basic e2e tests for the new UI 2018-05-24 23:23:42 -02:30
Whymarrh Whitby f5cefbbeda fix: Why does npm insist on reordering the lockfile? 2018-05-24 23:23:42 -02:30
kumavis 8e672a82e2
Merge pull request #4241 from MetaMask/greenkeeper/ethjs-0.4.0
Update ethjs to the latest version 🚀
2018-05-23 16:41:26 -07:00
Alexander Tseung df38b0f307
Fix scrolling in Deposit Ether modal (#4336) 2018-05-23 14:26:25 -07:00
Frankie ed01c6c826
Merge pull request #4337 from MetaMask/recent-blocks-parallel
controllers - recent-blocks - pull first historical blocks in parallel
2018-05-22 16:08:33 -07:00
kumavis cee55b47d0
Merge pull request #4321 from MetaMask/testing
MM controller tests and reorganizing test files
2018-05-22 13:02:41 -07:00
Thomas Huang 492b4a6743
Merge pull request #4333 from MetaMask/test-e2e-check-for-errors
test - e2e - check for console errors after each test
2018-05-22 12:59:55 -07:00
kumavis b5bbfd3264
Merge pull request #4308 from MetaMask/i4232-addtoken
Update designs for Add Token screen
2018-05-22 12:53:59 -07:00
Thomas Huang a8e0d38cfb
Merge pull request #4338 from MetaMask/ci-job-screens-enhance
ci - screens - continue screenshots through account creation + export account
2018-05-22 09:37:15 -07:00
kumavis fa37ba3992 controllers - recent-blocks - pull first historical blocks in parallel 2018-05-22 01:58:36 -07:00
kumavis 1fbf59cdd3 ci - screens - continue screenshots through account creation + export account 2018-05-22 01:56:52 -07:00
kumavis 83782421bb test - e2e - only inspect console for errors in chrome 2018-05-21 20:17:46 -07:00
kumavis a3ca64d321 test - e2e - ignore 'development build of Redux' warning 2018-05-21 19:59:21 -07:00
kumavis 4856c0803f test - e2e - ignore 'development build of React' warning 2018-05-21 19:57:13 -07:00
kumavis 81ff04ec27 test - e2e - ignore favicon 404s 2018-05-21 18:00:22 -07:00
kumavis 0b84ceae68 old-ui - app - use state.metamask.selectedAddress instead of currentView.context 2018-05-21 17:58:48 -07:00
kumavis 5d8dd1df0e old-ui - ens-input - fix params passed to input 2018-05-21 17:29:03 -07:00
kumavis db08d8d43e test - e2e - ignore react 'unknown props dataset' warnings 2018-05-21 17:15:05 -07:00
tmashuang 238f2eb179 Merge branch 'develop' into testing 2018-05-21 16:36:48 -07:00
kumavis 9c6e2ec8ef test - e2e - check for console errors after each test 2018-05-21 16:26:38 -07:00
Frankie e8b2e11c56 Reveal get filtered tx list (#4332)
* add getFilteredTxList from txController to getApi

* transactions - remove dead code (isNonceTaken)
2018-05-21 16:00:44 -07:00
Thomas Huang 45ad371622
Merge pull request #4297 from MetaMask/ci-publish-release
CI - publish release/prerelease
2018-05-21 15:44:40 -07:00