kumavis
564bb9f652
test - e2e - clear phishing warning
2018-06-14 00:23:38 -07:00
kumavis
722c5ae821
notice-controller - update memStore on boot
2018-06-14 00:23:01 -07:00
kumavis
4b8a4fd5fe
test - e2e - check for phishing warning
2018-06-13 23:52:51 -07:00
kumavis
44a8e48a04
notices - replace getLatestNotice with getNextNotice
2018-06-13 23:30:31 -07:00
kumavis
ac8b56a00d
notices - notices collection is now manually edited
2018-06-13 22:56:46 -07:00
Kevin Serrano
4481c7be44
Add changelog item.
2018-06-13 13:52:34 -07:00
Kevin Serrano
9c5a9b9b7f
Add phishing notice.
2018-06-13 13:51:39 -07:00
Kevin Serrano
451d05a400
Merge pull request #4560 from MetaMask/nonce-tracker-mutex-fix
...
changelog - add note on nonce-lock mutex fix
2018-06-13 09:53:17 -07:00
kumavis
5032d6e4c5
Merge branch 'develop' into nonce-tracker-mutex-fix
2018-06-12 23:22:09 -07:00
Dan Finlay
73a9aaa833
Merge pull request #4558 from MetaMask/stop-reload-on-network-change
...
Stop reload on network change
2018-06-12 15:48:17 -07:00
Erik Marks
bb201d7c4a
Merge branch 'develop' into stop-reload-on-network-change
2018-06-12 13:39:21 -07:00
Erik Marks
6ba70a039a
update changelog
2018-06-12 13:37:37 -07:00
Erik Marks
be505ddf6c
undo package.json and package-lock.json changes
2018-06-12 13:30:50 -07:00
kumavis
013d8451c8
changelog - add note on nonce-lock mutex fix
2018-06-12 13:08:28 -07:00
kumavis
0740dd6a5b
Merge pull request #4557 from MetaMask/nonce-tracker-mutex-fix
...
Bug: Mutex locks not released on error
2018-06-12 13:07:19 -07:00
kumavis
604289c96c
controllers - transaction - prefer log over console
2018-06-12 12:08:06 -07:00
kumavis
177cc3f280
metamask - ensure all nonce locks are released
2018-06-12 11:51:35 -07:00
Dan Finlay
77dc75c9b1
Merge pull request #4556 from MetaMask/WatchTestReload
...
Add script for auto-re-running unit tests on changes
2018-06-12 11:38:28 -07:00
kumavis
8f93e34175
nonce-tracker - wrap nonce calculations in try-catch and release lock on error
2018-06-12 11:31:26 -07:00
Dan Finlay
9c77af1ce6
Add script for auto-re-running tests on change
...
`npm run watch:test:unit` will re-run the unit test suite whenever a
file in `app`, `ui`, or `test` changes.
2018-06-12 11:13:44 -07:00
Erik Marks
b982961381
removed auto-reload.js, moved global web3 export to inpage.js
2018-06-12 11:04:37 -07:00
Whymarrh Whitby
f08442e266
Merge pull request #4554 from whymarrh/fix-e2e-profile-path
...
Fix temp Chrome profile path used for e2e tests
2018-06-12 15:14:13 -02:30
Whymarrh Whitby
c56ed16891
Fix e2e test Chrome profile paths
2018-06-12 14:11:20 -02:30
Erik Marks
f461bd8812
wip
2018-06-12 09:28:50 -07:00
Dan J Miller
b7a469681b
Merge pull request #4535 from MetaMask/i4508-fix-gas-edit-confirm-screen
...
Fix gas limit editing on confirm screen
2018-06-11 10:39:57 -02:30
Dan
049071a743
Access correct property from state in confirm screen components gatherTxMeta()
2018-06-08 12:52:38 -02:30
Dan Finlay
c0d2dab28b
Merge pull request #4523 from MetaMask/i4462-FixResetBug
...
Fix bug where reset account would not work.
2018-06-07 10:47:34 -07:00
Dan J Miller
988283778a
Merge pull request #4090 from MetaMask/i3725-refactor-send-component-
...
I3725 Refactor Send Component
2018-06-07 00:50:16 -02:30
Dan
a09d609360
Bump beta e2e timeouts on faucet page.
2018-06-06 22:15:38 -02:30
Dan
11f5fdc927
Merge branch 'develop' into i3725-refactor-send-component-
2018-06-06 21:55:20 -02:30
kumavis
c86213bf11
Merge pull request #4385 from MetaMask/ci-test-e2e-beta
...
CI - Add e2e-beta tests
2018-06-06 16:58:34 -07:00
Dan Finlay
c53c5d5c9e
Fix bug where reset account would not work.
...
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.
2018-06-06 16:46:39 -07:00
kumavis
aea9491f6a
Merge pull request #4477 from MetaMask/i3073-block-gravityforms
...
Block gravityforms.com from web3 injection
2018-06-06 12:24:05 -07:00
Dan
ae55e8a3c1
Merge branch 'develop' into i3725-refactor-send-component-
2018-06-06 16:40:43 -02:30
Thomas Huang
1fb408f62e
Merge pull request #4512 from MetaMask/test-metamask-no-diagnostics
...
test - metamask-controller - disable diagnostics
2018-06-06 11:54:59 -07:00
kumavis
d30f03dcbf
Merge pull request #4414 from scsaba/recipient-blacklist
...
Disallow sending to ganache default accounts on main net
2018-06-06 11:54:01 -07:00
kumavis
72f7a4e1d0
Merge pull request #4418 from MetaMask/handle-import-account-failure-in-ui
...
Handle errors for null selected address after Importing account (json or private key)
2018-06-06 11:47:45 -07:00
kumavis
546996c1f9
Merge pull request #4514 from whymarrh/account-label-type-check
...
Add account type assertion to PreferencesController#setAccountLabel
2018-06-06 11:42:52 -07:00
03-26
ccd4884db1
i18n - ja improvements
2018-06-06 11:38:57 -07:00
Thomas Huang
00f2433952
Merge pull request #4515 from MetaMask/master
...
Merge Master into Develop
2018-06-06 11:37:17 -07:00
Dan J Miller
191c3df108
Merge pull request #4507 from whymarrh/fix-account-order
...
Render accounts in keyring order
2018-06-06 15:21:45 -02:30
Dan
72649a0b59
Improve e2e beta tests by adding appropriate waits.
2018-06-06 13:45:08 -02:30
Dan
12e7508584
Conditionally close info page in beta e2e tests.
2018-06-06 07:34:25 -02:30
Dan
3d57352e54
Merge remote-tracking branch 'whymarrh/ci-test-e2e-beta' into ci-test-e2e-beta
2018-06-06 06:48:15 -02:30
Whymarrh Whitby
6ee9685490
Fix mock addresses used for integration tests
2018-06-05 19:48:42 -07:00
Dan
bb4de95f76
Fix e2e beta tests to account for add-token updates and actual behaviour of tab openings on installation.
2018-06-05 22:16:03 -02:30
Dan
fbcab7a91e
Merge branch 'develop' into ci-test-e2e-beta
2018-06-05 22:15:06 -02:30
Whymarrh Whitby
df6d03cefd
Fix account list order for the old UI
2018-06-05 17:17:27 -07:00
Whymarrh Whitby
d9d09f953b
Render the accounts in keyring order
2018-06-05 17:17:27 -07:00
Whymarrh Whitby
8b449b325d
Remove unused identities reducer from UI
2018-06-05 17:17:27 -07:00
