Esteban MIno
4e6c71e969
Merge branch 'develop' into WatchTokenFeature
2018-08-21 20:14:49 -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
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
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
Bruno Barbieri
bd904c86f6
Merge branch 'develop' into ledger-support
2018-08-17 13:45:46 -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
Esteban MIno
dbab9a007f
delete according image when token added with watchToken deleted
2018-08-16 21:17:02 -03:00
Esteban MIno
bb868f5834
correct behavior when notification is closed when popup
2018-08-16 20:19:19 -03:00
Esteban MIno
a36ea0e232
show watch asset image from hide token modal
2018-08-16 12:04:43 -03:00
Esteban MIno
5289a36664
change watchAsset to new spec for type ERC20
2018-08-15 20:01:59 -03:00
Esteban MIno
b766104c8d
add suggested tokens objects in metamask state
2018-08-15 18:34:57 -03: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
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
Thomas
96d789d2cf
Merge branch 'develop' into network-remove-provider-engine
...
Override package-lock and fix merge conflicts
2018-08-14 10:44:42 -07:00
Esteban MIno
8f5b80a0fe
update method to metamask_watchToken
2018-08-14 13:58:47 -03:00
brunobar79
b77cc3d969
fix tx tests
2018-08-14 03:42:23 -04:00
brunobar79
61a279204a
legacy and new hd path working
2018-08-14 01:26:18 -04:00
brunobar79
4e1d8ba19d
good progress adding paths
2018-08-13 19:29:43 -04:00
brunobar79
8f9a0a535c
clean up
2018-08-12 01:43:41 -04:00
brunobar79
0b9b892c6b
this should be ready to go
2018-08-12 01:34:01 -04:00
brunobar79
2355573340
clean up
2018-08-12 00:06:36 -04:00
brunobar79
e6d64cecf8
message signing works
2018-08-11 20:26:34 -04:00
brunobar79
068bf43615
working
2018-08-11 19:27:24 -04:00
brunobar79
12b41b8fc2
tx signature is valid
2018-08-11 18:20:50 -04:00
brunobar79
011cc141b3
tx signing should work
2018-08-11 16:00:29 -04:00
brunobar79
aa6a42e3de
rename keyring
2018-08-11 05:11:21 -04:00
brunobar79
8e842a8947
able to add accounts
2018-08-11 05:02:02 -04:00
brunobar79
78a1cd3314
iframe communication working
2018-08-11 02:35:20 -04:00
brunobar79
5ef80495cf
refactor to support multiple hw wallets
2018-08-10 21:54:34 -04:00
Bruno Barbieri
e2be22a4b7
Merge pull request #4897 from MetaMask/qr-code-scan
...
QR Code Scanner
2018-08-10 13:40:06 -04:00
Dan Finlay
be1d5a7dd9
Merge pull request #5020 from MetaMask/FixMigration28
...
Fixes migration 28
2018-08-09 14:24:38 -07:00
Jenny Pollack
00a2ab21ae
sentry - change releaseVersion to release
2018-08-09 13:49:40 -07:00
Esteban MIno
8df3f2696c
fix migration 28
2018-08-09 16:15:56 -04:00
Eduardo Antuña Díez
a2082bae5c
Avoid overwriting a domain that can be resolved by DNS
...
According to the current implementation any domain ending in .eth or .test will try to resolve through ENS even if the DNS is able to resolve it.
changing `onBeforeRequest` to `onErrorOccurred` will only resolve those .eth or .test domains that the DNS is not able to resolve.
2018-08-09 12:20:51 +02:00
Eduardo Antuña Díez
543207b5af
Fixed ENS to IPFS functionality in Firefox
...
`tabs.getSelected` is deprecated and it doesn't work in firefox replaced by `tabs.query({active: true}`
2018-08-09 12:14:09 +02:00
brunobar79
c6b7e460b5
code review changes
2018-08-08 03:00:39 -04:00
brunobar79
2e0916d8ff
fix merge conflicts
2018-08-08 02:32:35 -04:00
Esteban MIno
33357e3538
refactor unused code
2018-08-07 19:12:16 -04:00
Esteban MIno
15ea8c04b2
fix merge
2018-08-07 17:53:36 -04:00
Esteban Miño
3f57d5f66b
Merge branch 'develop' into WatchTokenFeature
2018-08-07 17:50:58 -04:00
