Esteban MIno
68c1b4c170
watchAsset returns result wether token was added or not
2018-08-20 22:32:14 -03: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
Thomas
d636cc3552
v4.9.3
2018-08-15 10:06:20 -07:00
Thomas
595fc403ed
Bump Changelog
2018-08-15 10:05:43 -07:00
Dan Finlay
7c47187f4d
Merge pull request #5037 from MetaMask/master
...
Update develop branch to v4.9.2
2018-08-15 10:02:20 -07:00
brunobar79
837be704f5
change Metamask for MetaMask
2018-08-15 11:44:00 -04:00
Dan J Miller
a41afebd66
Merge pull request #5059 from MetaMask/e2e-tests-more-reliable
...
Another e2e beta test fix
2018-08-15 12:10:04 -02:30
brunobar79
d2d8d38346
update package-lock.json
2018-08-14 23:08:50 -04:00
brunobar79
8fb7099bf2
Merge branch 'ledger-support' of github.com:MetaMask/metamask-extension into ledger-support
2018-08-14 23:02:14 -04:00
brunobar79
e54b8507d2
use eth-ledger-bridge-keyring from npm
2018-08-14 23:02:01 -04:00
Bruno Barbieri
80fe3ce888
Merge branch 'develop' into ledger-support
2018-08-14 22:55:47 -04:00
brunobar79
82a5ed1e03
remove console logs
2018-08-14 22:40:29 -04:00
brunobar79
fdf202efb0
fixed unit tests
2018-08-14 21:19:01 -04:00
brunobar79
53dcad5a3b
more ui
2018-08-14 19:38:23 -04:00
brunobar79
19d1988715
fix
2018-08-14 19:24:15 -04:00
brunobar79
c72ced79ae
ui fixes
2018-08-14 19:22:00 -04:00
Esteban MIno
a4b6b2357a
watchToken to watchAsset
2018-08-14 20:09:56 -03:00
Esteban MIno
a4c3f6b65c
add support for images base64 and urls on new ui
2018-08-14 20:08:12 -03:00
Dan Miller
3c8a4162a4
Remove unnecessary else in test/e2e/beta/contract-test/contract.js
2018-08-14 19:18:04 -02:30
Dan Finlay
d7aa1bf5c0
Merge pull request #5060 from MetaMask/bignumber-string
...
Cast arguments for new Bignumbers() to string.
2018-08-14 14:36:27 -07:00
Dan Miller
ff72423491
Add explicit waits for submitted status for some txs initiated from test dapp.
2018-08-14 17:30:43 -02:30
Thomas
ce645561fb
Remove commented out code for detect-token-test
2018-08-14 12:29:57 -07:00
