m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-23 20:05:27 +02:00
Code
7,607 Commits 2 Branches 0 Tags 265 MiB
1d4ee6bf76
Commit Graph

7607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan J Miller
1d4ee6bf76
Merge pull request #4986 from MetaMask/approve-calc-token-decimals 
Use token decimals when calculating confirm screen token approval amount
 2018-08-08 16:26:03 -02:30
Paul Bouchon
8ac4b586eb
Update eth-keyring-controller and eth-hd-keyring versions (#4989) 2018-08-08 13:17:48 -04:00
Bruno Barbieri
bb52985722
Merge pull request #4988 from MetaMask/remove-engine-restrictions 
Remove engine restrictions
 2018-08-08 12:13:45 -04:00
brunobar79
a92e5ec527 remove engine restrictions 2018-08-08 11:46:54 -04:00
Dan Finlay
fdfcc7d687
Merge pull request #4982 from MetaMask/sig-version-fix 
Reestablish old versions of eth-keyring-controller and eth-hd-keyring
 2018-08-08 08:26:49 -07:00
Dan Miller
c4f1dfb82e Use token decimals when calculating confirm screen amount for token approvals. 2018-08-08 12:36:59 -02:30
bitpshr
365e349ec4 Reestablish old versions of eth-keyring-controller and eth-hd-keyring 2018-08-08 08:17:16 -04:00
Justin Kat
aab6e366c5 Fixing translations in first-time init menu (#4969) 2018-08-07 23:27:52 -02:30
Dan Finlay
e9f74f005d
Merge pull request #4884 from MetaMask/TokensPerAccountBasis 
Tokens per account & network basis
 2018-08-07 13:30:26 -07:00
Esteban MIno
66c76c04ef CHANGELOG 2018-08-07 14:25:21 -04:00
Esteban MIno
b3af9cdf2e Merge branch 'develop' into TokensPerAccountBasis 2018-08-07 14:20:49 -04:00
Dan Finlay
d549c4b871
Merge pull request #4965 from MetaMask/4.9.0 
Update CHANGELOG.md
 2018-08-07 11:20:09 -07:00
Esteban MIno
c0cdda8321 Merge branch 'develop' into TokensPerAccountBasis 2018-08-07 14:17:40 -04:00
Kevin Serrano
bb40a8169c
Update CHANGELOG.md 2018-08-07 10:05:05 -07:00
Whymarrh Whitby
564fb9f563
Merge pull request #4960 from whymarrh/import-account-error 
Show invalid seed phrase error when importing new account
 2018-08-07 02:37:14 -02:30
Whymarrh Whitby
d0611741a2 Show invalid seed phrase error when importing new account 2018-08-07 02:09:26 -02:30
Whymarrh Whitby
7325ccf0fe
Merge pull request #4951 from whymarrh/update-pkgs 
Update e2e test packages 📦
 2018-08-06 16:22:04 -02:30
Whymarrh Whitby
46046c6915 Update chromedriver pkg 2018-08-06 15:47:57 -02:30
Whymarrh Whitby
d1435fb883 Switch superstatic for static-server pkg 2018-08-06 15:47:57 -02:30
Whymarrh Whitby
29488b2c53 Add static-server devDependency 2018-08-06 15:47:57 -02:30
Whymarrh Whitby
6132238302 Remove superstatic package 
Install and uninstalling superstatic doesn't work on Node 8 at the time of
writing:

    $ npm install -D superstatic@6
    npm ERR! code ENOTSUP
    npm ERR! notsup Unsupported engine for got@5.7.1: wanted: {"node":">=0.10.0 <7"} (current: {"node":"8.11.3","npm":"6.3.0"})
    npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1
    npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1
    npm ERR! notsup Required: {"node":">=0.10.0 <7"}
    npm ERR! notsup Actual:   {"npm":"6.3.0","node":"8.11.3"}

This commit removes the package (using Node 6!) and it will have to be replaced.
 2018-08-06 15:47:57 -02:30
Whymarrh Whitby
c3ed8e56ab Refresh package-lock.json file with npm@6.3.0 2018-08-06 15:47:57 -02:30
Dan J Miller
f8bb6ef7cf
Merge pull request #4868 from MetaMask/further-e2e-improvements 
Further new ui e2e test improvements
 2018-08-06 15:31:00 -02:30
Dan Miller
7de2a0687d Fix seed word confirmation step of e2e beta tests. 2018-08-06 12:14:06 -02:30
Dan Miller
aff66f4b07 Use unmodified constant for test delay in from-import-beta-spec. 2018-08-06 11:07:16 -02:30
Dan Miller
74e2225f36 Improve waits for new tx-list-items after first contract method call in e2e beta tests. 2018-08-06 11:07:16 -02:30
Alexander Tseung
f2194e8482
Merge pull request #4948 from MetaMask/i4638-update-font 
Update Font in Account Selector
 2018-08-03 17:24:42 -07:00
Alexander Tseung
114d1c1779
Merge pull request #4947 from MetaMask/i4532-disable-confirm-onsubmit 
Disable Confirm button on subsequent clicks to prevent confirming mul…
 2018-08-03 16:48:25 -07:00
Alexander Tseung
8e3f0b4202 Update Font in Account Selector 2018-08-03 16:47:50 -07:00
Alexander Tseung
6d76d4e228 Disable Confirm button on subsequent clicks to prevent confirming multiple times 2018-08-03 14:44:57 -07:00
Kevin Serrano
e77424ef5a
Merge pull request #4906 from MetaMask/updatePhishingPage 
Update Phishing HTML
 2018-08-02 12:50:45 -07:00
Dan J Miller
6ccc34cb52
Merge pull request #4926 from MetaMask/update-logic-for-retry-button 
Show the retry button on latest tx of earliest nonce.
 2018-08-01 00:04:27 -02:30
Esteban MIno
d8817b2646 fix doc tag 2018-07-31 16:18:06 -04:00
Esteban MIno
3124e8c612 tokens related functions refactor 2018-07-31 15:59:19 -04:00
Dan Miller
0ff0a9c197 Show the retry button on latest tx of earliest nonce. 2018-07-31 16:37:14 -02:30
Esteban MIno
ccae79d392 fix undefined for tokens on tests 2018-07-31 13:07:28 -04:00
Whymarrh Whitby
4f02726fd9
Merge pull request #4888 from whymarrh/suggest-new-ui 
Add old UI component to suggest new UI
 2018-07-31 14:32:21 -02:30
William Morriss
2cefab544d
Merge pull request #4908 from MetaMask/npm-install 
Restore npm install instructions to README
 2018-07-30 18:04:21 -07:00
Esteban MIno
22cf5a1391 improve comments 2018-07-30 20:44:22 -04:00
Esteban MIno
822c1734d6 fix double state update when account changed 2018-07-30 20:36:31 -04:00
William Morriss
cfb74680e2 Select not Update 2018-07-30 16:59:08 -07:00
Esteban MIno
fbcba8f019 create tokens storage when setadresses 2018-07-30 19:09:17 -04:00
Esteban MIno
31286673c3 isolation of tokens related methods in preferences 2018-07-30 18:43:34 -04:00
Esteban MIno
0757f47e84 passing tokens to all accounts in migration 2018-07-30 11:41:31 -04:00
Whymarrh Whitby
c3ce2984ef Remove the development notice from UI onboarding 2018-07-28 11:59:51 -02:30
Whymarrh Whitby
f9871fe60b Open UI in browser post-new-UI-switch 2018-07-28 11:59:51 -02:30
Whymarrh Whitby
0fd8862c5e Don't show an additional beta UI notification 
When a user has opted-in to the new UI from the announcement, we don't
need an additional notification letting the user know that they've
switched.
 2018-07-28 11:59:51 -02:30
Dan Miller
07c0cd59d4 New ui e2e tests switch to localhost provider (needed after new ui selection screen addition). 2018-07-28 11:59:51 -02:30
Dan Miller
915c4fd1b1 Fix integration tests to accomodate new ui suggestion screen changes. 2018-07-28 11:59:51 -02:30
Dan Miller
30d92b8d3f Fix e2e tests to accomodate new ui suggestion screen changes. 2018-07-28 11:59:51 -02:30