m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code
6,942 Commits 2 Branches 0 Tags 265 MiB
2198276bd5
Commit Graph

6942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kumavis
2198276bd5 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-06-06 12:05:38 -07:00
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
kumavis
ffb8fa1649 lint - remove unused require 2018-06-06 11:17:52 -07:00
kumavis
9d77b0a196 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-06-06 11:08:29 -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
Whymarrh Whitby
6ee9685490 Fix mock addresses used for integration tests 2018-06-05 19:48:42 -07:00
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
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
Whymarrh Whitby
762695bfd9 Ensure selectedAddress exists when render wallet 2018-06-05 12:04:03 -07:00
kumavis
ece5cfc785 lint - fix diagnostics reporter 2018-06-05 11:53:21 -07:00
kumavis
20bdba3d17 diagnostics - rewrite bug-notifier as diagnostics-reporter 2018-06-05 11:51:27 -07:00
kumavis
6247e54fcc add multivault detection to diagnostics reporting 2018-06-05 11:15:58 -07:00
Dan
49f0df3174 Merge branch 'develop' into handle-import-account-failure-in-ui 2018-06-05 09:56:36 -02:30
Thomas Huang
e1cd3562ce
Merge pull request #4490 from MetaMask/v4.7.3 
Version 4.7.3
 2018-06-04 16:37:58 -07:00
kumavis
c12b02b4af changelog - add note on new modal 2018-06-04 16:16:18 -07:00
kumavis
98b0c160c9 Merge branch 'develop' of github.com:MetaMask/metamask-extension into v4.7.3 2018-06-04 16:14:37 -07:00
Dan J Miller
3b6e96bac9 Update hide-token-confirmation-modal.js to use new modalState schema (#4482) 
* Update hide-token-confirmation-modal.js to use new modalState schema (added in 41e38fe55).

* Fix modalState props
 2018-06-04 16:13:32 -07:00
kumavis
12a7fc4016 4.7.3 2018-06-04 16:11:19 -07:00
kumavis
ddce3d148e
Merge pull request #4486 from MetaMask/i4475-ClearUnknownIdentities 
Clear unknown identities
 2018-06-04 16:04:07 -07:00
Dan Finlay
41f292437d Record identity before deleting it 2018-06-04 15:34:38 -07:00
Dan Finlay
ae156e1087 Mock notifier in test 2018-06-04 15:26:01 -07:00
Dan Finlay
f07ca73e07 Add comment 2018-06-04 15:18:12 -07:00
Dan Finlay
415ab2d534 Do not alert to user 2018-06-04 15:17:03 -07:00
Dan Finlay
22754e3e1f Linted 2018-06-04 15:10:51 -07:00
Dan Finlay
7b87afb4b7 Add bug info under metadata key 2018-06-04 15:06:21 -07:00
Dan Finlay
0eacee8e45 Add first time info to bug report 2018-06-04 15:03:31 -07:00
Dan Finlay
3bfc40c284 Add version to report 2018-06-04 14:59:46 -07:00
Dan Finlay
cd1e77c0f6 Add changelog entry 2018-06-04 14:56:50 -07:00
Dan Finlay
d07c664b2c Fine tune error posting 2018-06-04 14:30:24 -07:00
Dan Finlay
b858cc4b1b Only notify first time lost ids are detected 2018-06-04 14:24:45 -07:00
Dan Finlay
f3b385cb09 Add reporting uri 2018-06-04 14:22:34 -07:00
Dan Finlay
fd1ce4d741 Begin adding unconfigured notifier 2018-06-04 14:21:46 -07:00
Dan Finlay
8fcaa2cf56 Persist lost identities to storage for later analysis 2018-06-04 14:05:56 -07:00
Dan Finlay
f5d4acf53b Add minimal user notification of issue. 2018-06-04 14:01:05 -07:00