1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-23 18:41:38 +01:00
Commit Graph

7141 Commits

Author SHA1 Message Date
Erik Marks
f461bd8812 wip 2018-06-12 09:28:50 -07:00
Dan Finlay
b24efcb1cd Make account import tests much more specific
However, they no longer seem to work. I'm unclear why this test is
failing. The private key being provided should be valid.
2018-06-11 14:58:05 -07:00
Bobby Dresser
4196b16f06 add help link to eth_sign warning 2018-06-11 14:28:57 -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
kumavis
368fe229c2
changelog - version fix 2018-06-08 21:04:20 -07:00
Dan
049071a743 Access correct property from state in confirm screen components gatherTxMeta() 2018-06-08 12:52:38 -02:30
Jenny Pollack
93bdfc0bba changelog 4270 2018-06-07 14:15:02 -07:00
Jenny Pollack
e7c2710a55 Merge branch 'develop' into save-brave 2018-06-07 14:10:56 -07:00
Dan Finlay
385927a1b9 Improve private key import tests 2018-06-07 13:34:10 -07:00
Dan Finlay
b7fe4b820d Improve test formatting 2018-06-07 10:54:19 -07:00
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
Jenny Pollack
fd8bcc9cb1 lint 2018-06-06 22:08:32 -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
Jenny Pollack
01a1eff8a8 remove loglevel 2018-06-06 18:35:41 -07:00
Jenny Pollack
7edde61c12 preferred first languauge - check for Brave 2018-06-06 18:24:45 -07:00
Jenny Pollack
275c31855d first language - add check for brave browser on getAcceptLanguages 2018-06-06 18:10:05 -07:00
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
Whymarrh Whitby
3cc85c219e Add account type assertion to PreferencesController#setAccountLabel 2018-06-05 14:06:56 -07:00
Dan Finlay
3e0747f9ce Bump changelog 2018-06-05 13:45:38 -07:00
Dan Finlay
d61c979de6 Add validation for importing empty private key
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.
2018-06-05 13:44:03 -07:00
kumavis
39a7702c8f
Merge pull request #4511 from MetaMask/v4.7.4
Version 4.7.4
2018-06-05 13:35:25 -07:00
kumavis
da938ded5c
test - metamask-controller - disable diagnostics 2018-06-05 13:31:34 -07:00
kumavis
f73feccf5a 4.7.4 2018-06-05 13:22:48 -07:00
kumavis
cb7307b7ca Merge branch 'master' of github.com:MetaMask/metamask-extension into v4.7.4 2018-06-05 13:20:31 -07:00
kumavis
c2e3194dbf
Merge pull request #4509 from whymarrh/wallet-view-assertion
Add explicit selectedAddress assertion to the wallet view
2018-06-05 12:57:24 -07:00
kumavis
5b3af34139
Merge pull request #4506 from MetaMask/diagnostics-multivault
diagnostics - add multiple vault detection to diagnostics reporting
2018-06-05 12:51:41 -07:00
kumavis
60e61e6834 diagnostics - fix reportMultipleKeyrings call 2018-06-05 12:36:15 -07:00
Whymarrh Whitby
665ac860e5 Remove selectedIdentity prop from wallet view
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.
2018-06-05 12:25:06 -07:00
kumavis
36a0574f56 diagnostics - minor fixes 2018-06-05 12:20:24 -07:00