1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

5589 Commits

Author SHA1 Message Date
Dan Finlay
b97ac5106f Add clarifying comment 2018-03-07 14:38:26 -08:00
Dan Finlay
d58e47edec Some fixes for new storage strategy
- Don't persist undefined data
- Write to new storage strategy without waiting for completion.
- Continue writing to localStorage as fallback.
2018-03-07 14:23:31 -08:00
Dan Finlay
8965e59ba7 Update yarn.lock 2018-03-07 13:50:28 -08:00
Dan Finlay
ab55c184c7 Increase storage debounce to 2s 2018-03-07 13:50:22 -08:00
Dan Finlay
d0ba2d2d94 Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-07 13:39:44 -08:00
Dan J Miller
ca047b1ea0
Update network colours for better accessibility. () 2018-03-07 15:22:10 -03:30
Thomas Huang
a74439a1a7
Merge pull request from MetaMask/greenkeeper/karma-2.0.0
Update karma to the latest version 🚀
2018-03-07 13:50:41 -05:00
Thomas Huang
bd67deae13
Merge pull request from trigun0x2/master
fix typo in transaction.js
2018-03-07 13:48:14 -05:00
Jeffrey Tong
cad5f5f000 fix typo in tests and tx-state-manager 2018-03-07 10:24:36 -08:00
Jeffrey Tong
57dc5a6e9b fix typo in transaction.js 2018-03-06 20:37:26 -08:00
Thomas Huang
5ebdb215ae
Merge pull request from MetaMask/version-4.2.0
Version 4.2.0
2018-03-06 20:51:53 -05:00
kumavis
e91a521b1b Version 4.2.0 2018-03-06 17:30:12 -08:00
kumavis
d901268475
Merge pull request from MetaMask/ImportAccountMessageV2
Import account disclaimer and change loose label to imported.
2018-03-06 17:25:49 -08:00
kumavis
8a444ec96f
Merge pull request from MetaMask/controllerStubs
Offline testing
2018-03-06 17:21:36 -08:00
kumavis
6a9ca29244
Merge branch 'master' into ImportAccountMessageV2 2018-03-06 17:13:57 -08:00
kumavis
8e0131cbb5
Merge pull request from MetaMask/i2475-UnifyLogInWording
Replace Lock wording with Log Out / Log In
2018-03-06 17:12:32 -08:00
kumavis
36c5bf203e
Merge pull request from MetaMask/AutoVersionBump
Clean up run version bump script
2018-03-06 17:11:49 -08:00
Dan Finlay
9762a73041
Merge pull request from danjm/i3087-shapeshift-split-undefined
Shapeshift form handles 'market info unavailable' errors.
2018-03-06 15:07:51 -08:00
Dan Finlay
52b4876cf9
Merge pull request from danjm/NewUI-handle-token-balance-on-edit
Gracefully handle null token balance in new ui send.
2018-03-06 15:05:43 -08:00
Dan Finlay
31e7d9263f
Merge pull request from danjm/i3348-minus-not-a-number
Prevent user from selecting max amount until gas is estimated.
2018-03-06 15:05:25 -08:00
Dan Finlay
423f084cb4 Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-06 14:59:09 -08:00
Dan Finlay
cb4ad60800 Merge branch 'master' into i2475-UnifyLogInWording 2018-03-06 14:57:01 -08:00
Dan Finlay
b87687110d Replace Lock wording with Log Out / Log In
Fixes 
2018-03-06 14:51:26 -08:00
Dan J Miller
303801d276 Ensure this reference is defined in old-ui info.js () 2018-03-06 10:45:40 -08:00
Dan J Miller
5ac330a89e
Default add-token decimal value to string () 2018-03-06 15:15:26 -03:30
Dan Finlay
a4bd7992cd
Merge branch 'master' into ImportAccountMessageV2 2018-03-06 10:32:47 -08:00
Dan Finlay
dd9cac69ae
Merge pull request from scsaba/edge-support
Add Edge Support
2018-03-06 09:39:57 -08:00
Dan
376ffb758f Shapeshift form handles market info unavailable errors. 2018-03-06 13:49:41 -03:30
Alexander Tseung
5f8a632fec
Fix seed phrase validation clearing form ()
* Fix seed phrase validation clearing form

* Make new ui import seed error feedback live, and allow newlines with and without carriage returns.
2018-03-06 09:14:57 -08:00
Dan J Miller
9734969e5d
Add missed changelog updates. () 2018-03-06 10:51:21 -03:30
Csaba Solya
d8038c0de0 add browserify-unibabel to package.json 2018-03-06 09:23:43 +01:00
Dan
462d57cb6a Gracefully handle null token balance in new ui send. 2018-03-06 00:23:29 -03:30
Dan
68604b53dd Prevent user from selecting max amount until there is an estimated gas total. 2018-03-05 23:12:06 -03:30
Dan J Miller
1bd18cebd7
Fixes shapeshift coin selection dropdown. () 2018-03-05 13:33:46 -03:30
Thomas Huang
d3a0a27c0c
Merge branch 'master' into ImportAccountMessageV2 2018-03-02 18:26:52 -08:00
Thomas
ee254b4f6f Import Account disclaimer 2018-03-02 18:24:09 -08:00
Thomas
6f8077f587 Swap color scheme for import account label 2018-03-02 18:23:27 -08:00
Dan J Miller
0d97ff2210
Fix NewUI reveal seed flow. () 2018-03-02 22:44:05 -03:30
Dan Finlay
bdbe299069 Clean up run version bump script 2018-03-02 17:16:17 -08:00
Dan J Miller
0c163dcb32
Allow adding 0 balance tokens in old ui and editing custom token info in new ()
* Shows tokens with 0 balance in old ui; goHome after adding tokens.

* Allow users to edit custom token info when not autofilled. (New UI add token screen).
2018-03-02 19:07:25 -03:30
kumavis
6574f0b57b
Merge pull request from MetaMask/AutoVersionBump
Add version bumping script
2018-03-02 14:31:53 -08:00
Dan Finlay
3a9b3794eb Remove logs 2018-03-02 14:01:53 -08:00
Dan Finlay
bf17d7e115 Add version bumping script
One step towards automating our deploy process is automating our version
bumping scheme. This PR does that.
2018-03-02 13:55:56 -08:00
kumavis
996036628f
Merge pull request from MetaMask/Version-4.1.3
Version 4.1.3
2018-03-02 13:04:06 -08:00
Dan Finlay
452c5d0513 Version 4.1.3 2018-03-02 12:47:40 -08:00
Thomas Huang
cb109a8233 Add retry transaction back into old ui transaction list item ()
* Add retry transaction back into old ui transaction list item

* Update Changelog
2018-03-02 16:38:13 -03:30
Thomas Huang
97dd993606
Merge pull request from MetaMask/i3372-PreserveInpageProviderName
Fix inpage provider name regression
2018-03-02 10:56:39 -08:00
Dan Finlay
81fa0742f7 Fix inpage provider name regression
Fixes  by not minifying the name of our inpage provider, which some
people were using to identify MetaMask (not our preferred, supported
method of web3.currentProvider.isMetaMask).
2018-03-02 10:32:53 -08:00
Alexander Tseung
f22dfd4ae8 Fix network menu for custom URLs () 2018-03-01 17:42:10 -03:30
Alexander Tseung
ace4f0d998 Fix exception thrown when styleOverride is not present () 2018-03-01 17:41:35 -03:30