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
8,104 Commits 2 Branches 0 Tags 265 MiB
c4caba1317
Commit Graph

8104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Tseung
7294aede4f Add new variant for SenderToRecipient component 2018-08-22 10:53:20 -07:00
Esteban MIno
153731e462 fix integration tests on balance component with new watchAsset 2018-08-22 12:06:11 -03:00
kumavis
a2654108be account-tracker - only track blocks when there are activeControllerConnections 2018-08-21 16:49:24 -07:00
kumavis
3ac2b40dcf metamask controller - track active controller connections 2018-08-21 16:30:11 -07:00
Esteban MIno
4e6c71e969 Merge branch 'develop' into WatchTokenFeature 2018-08-21 20:14:49 -03:00
Esteban MIno
6ccf2811e7 unit tests for watchAsset 2018-08-21 19:17:57 -03:00
Dan Finlay
babd59a2dc
Merge pull request #5109 from MetaMask/MoveOutInpageProvider 
Move inpage-provider and port-stream outside
 2018-08-21 14:38:47 -07:00
Dan Finlay
a485516488
Merge pull request #5118 from MetaMask/provider2-bugfix 
bugfix - prevents old blocktracker from getting internal hooks migrated
 2018-08-21 14:27:34 -07:00
kumavis
13dfea7f2d bugfix - prevents old blocktracker from getting internal hooks migrated 2018-08-21 14:13:23 -07:00
Dan J Miller
4704f3598e
Merge pull request #5108 from MetaMask/run-ganache-with-blocktime-flag 
Fix e2e tests: adapt ganache flags and remove unnecessary checks
 2018-08-21 15:26:23 -02:30
Dan Miller
9bd0ce46e8 Remove unnecessary checks and user actions in metamask-beta-ui.spec 2018-08-21 14:45:27 -02:30
Jerome de Tychey
92af1ee95a
Typo in "send" translation 
send should be translated as Envoyer instead of Envoyé (which mean sent, not send)
 2018-08-21 18:56:24 +02:00
Dan Miller
1718b83d20 Run ganache with a blocktime flag for npm:run:ganache:start. 2018-08-21 13:47:42 -02:30
Esteban MIno
3a3732eb24 returning error in watchAsset 2018-08-21 13:12:45 -03:00
Esteban MIno
6fa889abcb refactor watchToken related functions 2018-08-21 12:59:42 -03:00
Bruno Barbieri
282820c93a
Merge pull request #5112 from MetaMask/hardware-wallet-fixes 
Hardware wallet fixes
 2018-08-21 10:48:40 -04:00
brunobar79
54021fd90b fix unit tests 2018-08-21 00:09:54 -04:00
brunobar79
cee5783283 fix hardware wallets account name 2018-08-21 00:04:30 -04:00
brunobar79
34e3ec6092 fix account removal 2018-08-21 00:04:07 -04:00
Esteban MIno
68c1b4c170 watchAsset returns result wether token was added or not 2018-08-20 22:32:14 -03:00
Dan Finlay
6ce119d1fb Move inpage-provider and port-stream outside 
With the creation of the [metamask-extension-provider](https://github.com/MetaMask/metamask-extension-provider) we have our first non-core module that is dependent on the inpage-provider and port-stream.

To reduce the size of its dependencies, I have moved the
[metamask-inpage-provider](https://github.com/MetaMask/metamask-inpage-provider) into its own module, as well as [extension-port-stream](https://github.com/MetaMask/extension-port-stream).

This allows them to be more easily depended & iterated on by external
projects.
 2018-08-20 15:45:50 -07:00
Esteban MIno
81cd29df43 Merge branch 'develop' into WatchTokenFeature 2018-08-20 19:35:38 -03:00
Dan Finlay
887cad973f
Merge pull request #5095 from MetaMask/i4953-update-logo 
Update logo wordmark
 2018-08-20 13:12:31 -07:00
Alexander Tseung
cec87a5b2c Update logo wordmark 2018-08-18 20:46:56 -07:00
kumavis
fb5faec372
Merge pull request #5090 from whymarrh/fix-ci 
Update CircleCI configuration to use workspaces instead of caches
 2018-08-17 16:31:32 -07:00
Whymarrh Whitby
00906937a1 ci: Use workspaces instead of caches for passing data downstream 
CircleCI no longer allows external PR builds to save caches so jobs
that depend on cached data from a upstream job will no longer get
the files they need. This change replaces our usages of caches for
passing data downstream with workspaces, which appear to be the more
correct feature to use.

References:

- https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
- https://circleci.com/blog/deep-diving-into-circleci-workspaces/
 2018-08-17 19:50:58 -02:30
Whymarrh Whitby
8f834ed87d ci: Install any npm@6 2018-08-17 18:51:02 -02:30
Whymarrh Whitby
2185197ef6 ci: Use Firefox 61.0.2 2018-08-17 18:41:12 -02:30
Whymarrh Whitby
7b89d3d473 ci: Disable Firefox updates 2018-08-17 18:41:12 -02:30
Whymarrh Whitby
e493efb123 ci: Don't cache Firefox install 
Two important notes:

1. The time it takes to download is negligble compared to e2e test runs
2. Since we cannot use environment variables in CircleCI cache keys we
   can't cache the download correctly and have it update when we switch
   firefox versions—this isn't the end of the world because of point 1
 2018-08-17 18:41:12 -02:30
Dan Finlay
c7f5436143
Merge pull request #5050 from MetaMask/ledger-support 
Add Ledger hardware wallet support
 2018-08-17 11:26:38 -07:00
Bruno Barbieri
bd904c86f6
Merge branch 'develop' into ledger-support 2018-08-17 13:45:46 -04:00
Dan Finlay
755369e4e4
Merge pull request #4898 from dmvt/multi-account-restore 
Restore multiple consecutive accounts with balances.
 2018-08-17 10:43:15 -07:00
brunobar79
0391ec37c8 update package-lock.json 2018-08-17 13:03:02 -04:00
brunobar79
992e7f1b5a fix merge conflicts 2018-08-17 12:56:07 -04:00
Dan Matthews
df799d7fd6 Restores accounts until one with a zero balance is found 2018-08-17 10:26:47 -04:00
brunobar79
51e4a6d335 fix ledger affiliate link 2018-08-16 21:15:50 -04:00
brunobar79
b369560569 fix e2e tests 2018-08-16 20:59:11 -04:00
brunobar79
285814646f ui ready 2018-08-16 20:41:23 -04:00
Esteban MIno
dbab9a007f delete according image when token added with watchToken deleted 2018-08-16 21:17:02 -03:00
brunobar79
2ea05e303d connect screen ready 2018-08-16 19:39:52 -04:00
Esteban MIno
bb868f5834 correct behavior when notification is closed when popup 2018-08-16 20:19:19 -03:00
Esteban MIno
2ace30bcd1 WIP 2018-08-16 18:28:07 -03:00
Esteban MIno
a36ea0e232 show watch asset image from hide token modal 2018-08-16 12:04:43 -03:00
Anatoli Babenia
59ba2d2785 info.js Remove width element to fix email layout (#4588) 
Fix for #2855 which is gone from master for some reason
 2018-08-16 11:09:57 -02:30
Esteban MIno
5289a36664 change watchAsset to new spec for type ERC20 2018-08-15 20:01:59 -03:00
Dan Finlay
955ec2dca6
Merge pull request #4279 from MetaMask/network-remove-provider-engine 
Enhancement: New BlockTracker and Json-Rpc-Engine based Provider
 2018-08-15 15:41:05 -07:00
Esteban MIno
b766104c8d add suggested tokens objects in metamask state 2018-08-15 18:34:57 -03:00
Bruno Barbieri
8b73a69cd8
Merge pull request #5061 from MetaMask/greenkeeper/@zxing/library-0.8.0 
Update @zxing/library to the latest version 🚀
 2018-08-15 13:46:32 -04:00
Dan Finlay
772c97088e
Merge pull request #5076 from MetaMask/v4.9.3 
V4.9.3
 2018-08-15 10:37:47 -07:00